Fix typo in merge script.
authormachenbach <machenbach@chromium.org>
Mon, 16 Feb 2015 19:07:31 +0000 (11:07 -0800)
committerCommit bot <commit-bot@chromium.org>
Mon, 16 Feb 2015 19:07:38 +0000 (19:07 +0000)
BUG=chromium:451975
TBR=tandrii@chromium.org
NOTRY=true
LOG=n

TEST=./script_test.py

Review URL: https://codereview.chromium.org/932703002

Cr-Commit-Position: refs/heads/master@{#26676}

tools/release/common_includes.py

index 0238d95..03b0c5b 100644 (file)
@@ -339,10 +339,10 @@ class GitInterface(VCInterface):
     if name in ["candidates", "master"]:
       return "refs/remotes/origin/%s" % name
     # Check if branch is in heads.
-    if self.Git("show-ref refs/remotes/origin/%s" % name).strip():
+    if self.step.Git("show-ref refs/remotes/origin/%s" % name).strip():
       return "refs/remotes/origin/%s" % name
     # Check if branch is in branch-heads.
-    if self.Git("show-ref refs/remotes/branch-heads/%s" % name).strip():
+    if self.step.Git("show-ref refs/remotes/branch-heads/%s" % name).strip():
       return "refs/remotes/branch-heads/%s" % name
     self.Die("Can't find remote of %s" % name)