From 9ead97bb51f5b1ad1d0a45e0c5442f15e1e38fd7 Mon Sep 17 00:00:00 2001 From: Zac Livingston Date: Tue, 13 Jun 2017 08:29:04 -0600 Subject: When starting a branch, do not use a tag or change value for branch.merge When starting a branch, branch.merge is set to project revision unless the revision is a SHA1. In that case, branch.merge is set to dest_branch if defined or manifest default revision otherwise. This special handling allows repo upload to work when the project revision is a SHA1. Extend the special handling to also happen when the project revision is a tag value or a change value so that repo upload will work in those case as well. Change-Id: Iff81ece40e770cd02535e80dcb023564d42dcf47 --- git_refs.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'git_refs.py') diff --git a/git_refs.py b/git_refs.py index 3c266061..58c838a6 100644 --- a/git_refs.py +++ b/git_refs.py @@ -16,11 +16,12 @@ import os from trace import Trace -HEAD = 'HEAD' -R_HEADS = 'refs/heads/' -R_TAGS = 'refs/tags/' -R_PUB = 'refs/published/' -R_M = 'refs/remotes/m/' +HEAD = 'HEAD' +R_CHANGES = 'refs/changes/' +R_HEADS = 'refs/heads/' +R_TAGS = 'refs/tags/' +R_PUB = 'refs/published/' +R_M = 'refs/remotes/m/' class GitRefs(object): -- cgit v1.2.3-54-g00ecf