From 066d1633a2b77a59cb4d095b6570b80dffd17f03 Mon Sep 17 00:00:00 2001 From: machenbach Date: Mon, 16 Feb 2015 11:07:31 -0800 Subject: [PATCH] Fix typo in merge script. 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/release/common_includes.py b/tools/release/common_includes.py index 0238d95..03b0c5b 100644 --- a/tools/release/common_includes.py +++ b/tools/release/common_includes.py @@ -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) -- 2.7.4