Tools/git-repo
1
0
Fork 0
Code Activity

When starting a branch, do not use a tag or change value for branch.merge

Browse source 
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
This commit is contained in:
Zac Livingston 2017-06-13 08:29:04 -06:00 • committed by David Pursehouse
parent e43322625a
commit 9ead97bb51
3 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
git_refs.py
View file

@ -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):