From b8ade81ab5b2e8d82d81cd8cb46f2e196e9654b0 Mon Sep 17 00:00:00 2001 From: machenbach Date: Tue, 17 Feb 2015 03:40:03 -0800 Subject: [PATCH] Fix branch test for merge script. Failing calls to show-ref cause an exception in python. BUG=chromium:451975 TBR=tandrii@chromium.org NOTRY=true LOG=n TEST=./script_test.py Review URL: https://codereview.chromium.org/933523003 Cr-Commit-Position: refs/heads/master@{#26684} --- tools/release/common_includes.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tools/release/common_includes.py b/tools/release/common_includes.py index 03b0c5b7d49..bae05bc6b54 100644 --- a/tools/release/common_includes.py +++ b/tools/release/common_includes.py @@ -338,12 +338,18 @@ def RemoteBranch(self, name): return name if name in ["candidates", "master"]: return "refs/remotes/origin/%s" % name - # Check if branch is in heads. - 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.step.Git("show-ref refs/remotes/branch-heads/%s" % name).strip(): - return "refs/remotes/branch-heads/%s" % name + try: + # Check if branch is in heads. + if self.step.Git("show-ref refs/remotes/origin/%s" % name).strip(): + return "refs/remotes/origin/%s" % name + except GitFailedException: + pass + try: + # Check if branch is in branch-heads. + if self.step.Git("show-ref refs/remotes/branch-heads/%s" % name).strip(): + return "refs/remotes/branch-heads/%s" % name + except GitFailedException: + pass self.Die("Can't find remote of %s" % name) def Tag(self, tag, remote, message):