android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2025-06-19 12:34:17 +00:00
Code Issues Packages Projects Releases Wiki 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

10
subcmds/start.py
View File

@ -18,7 +18,7 @@ import os
import sys
from command import Command
from git_config import IsId
from git_config import IsImmutable
from git_command import git
import gitc_utils
from progress import Progress
@ -96,11 +96,11 @@ revision specified in the manifest.
project.Sync_LocalHalf(sync_buf)
project.revisionId = gitc_project.old_revision
# If the current revision is a specific SHA1 then we can't push back
# to it; so substitute with dest_branch if defined, or with manifest
# default revision instead.
# If the current revision is immutable, such as a SHA1, a tag or
# a change, then we can't push back to it. Substitute with
# dest_branch, if defined; or with manifest default revision instead.
branch_merge = ''
if IsId(project.revisionExpr):
if IsImmutable(project.revisionExpr):
if project.dest_branch:
branch_merge = project.dest_branch
else: