summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorprasadv <prasadv@chromium.org>2014-08-27 17:39:46 -0700
committerCommit bot <commit-bot@chromium.org>2014-08-28 00:40:59 +0000
commitc99c87acd111df5c08f20e89e84e3ae1edfc4d4e (patch)
treeabb224832b2cf6faaf8045159070061f04a75b84 /tools
parentefba177008e6b876a085a96426c63566b1efc657 (diff)
downloadchromium_src-c99c87acd111df5c08f20e89e84e3ae1edfc4d4e.zip
chromium_src-c99c87acd111df5c08f20e89e84e3ae1edfc4d4e.tar.gz
chromium_src-c99c87acd111df5c08f20e89e84e3ae1edfc4d4e.tar.bz2
Fix git log command to while processing Commit position in SVNFindRev method
BUG= NOTRY=true Review URL: https://codereview.chromium.org/511033002 Cr-Commit-Position: refs/heads/master@{#292285}
Diffstat (limited to 'tools')
-rw-r--r--tools/auto_bisect/source_control.py2
-rw-r--r--tools/bisect-perf-regression_test.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/auto_bisect/source_control.py b/tools/auto_bisect/source_control.py
index fd3c4e3..27bd7ba 100644
--- a/tools/auto_bisect/source_control.py
+++ b/tools/auto_bisect/source_control.py
@@ -230,7 +230,7 @@ class GitSourceControl(SourceControl):
# TODO(prasadv): Use an appropriate command to find commit position instead
# of parsing the log. Resolve this once 407316 is fixed.
commit_position_pattern = 'Cr-Commit-Position: .*@\{#(?P<commit>[0-9]+)\}'
- cmd = ['log', '--format=%b', '-1', 'origin/master', git_revision]
+ cmd = ['log', '--format=%b', '-1', git_revision]
output = bisect_utils.CheckRunGit(cmd, cwd=cwd)
if output:
version_re = re.compile(commit_position_pattern)
diff --git a/tools/bisect-perf-regression_test.py b/tools/bisect-perf-regression_test.py
index 5947f5b..51cf7a4 100644
--- a/tools/bisect-perf-regression_test.py
+++ b/tools/bisect-perf-regression_test.py
@@ -265,7 +265,7 @@ class BisectPerfRegressionTest(unittest.TestCase):
bisect_options)
cp_git_rev = '7017a81991de983e12ab50dfc071c70e06979531'
- self.assertEqual(291915, source_control.SVNFindRev(cp_git_rev))
+ self.assertEqual(291765, source_control.SVNFindRev(cp_git_rev))
svn_git_rev = 'e6db23a037cad47299a94b155b95eebd1ee61a58'
self.assertEqual(291467, source_control.SVNFindRev(svn_git_rev))