From 42d8da5831efef34ac5cdc16ec6a6c587e57e492 Mon Sep 17 00:00:00 2001 From: "sky@chromium.org" Date: Fri, 23 Apr 2010 18:25:07 +0000 Subject: [PATCH] Changes GetSVNBranch to prefer origin/HEAD over all others. Review URL: http://codereview.chromium.org/1745009 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@45468 0039d316-1c4b-4281-b951-d872f2087c98 --- scm.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scm.py b/scm.py index 87514beac..cbb44f267 100644 --- a/scm.py +++ b/scm.py @@ -172,9 +172,9 @@ class GIT(object): for ref in remotes: match = git_svn_re.search( GIT.Capture(['cat-file', '-p', ref], cwd)[0]) - if match and match.group(1) not in svn_refs: - # To prefer local refs over remote ones we only set the first occurence. - # The assumption being local refs are usually first. + # Prefer origin/HEAD over all others. + if match and (match.group(1) not in svn_refs or + ref == "refs/remotes/origin/HEAD"): svn_refs[match.group(1)] = ref svn_branch = ''