android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-23 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always output upstream if specified

Browse Source 
Previously, in running the `manifest` command, we wouldn't output the
upstream if the default upstream would include the pinned sha1.
However, now that fetching refs/heads/* doesn't guarantee that we will
have the sha1, we need to always output the specified upstream branch.

Change-Id: Ib8b409a8ecd439397b38ee9649c530407797f841
This commit is contained in:
Conley Owens 2015-07-10 14:54:54 -07:00
parent c5ceeb1625
commit 551dfecea9
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifest_xml.py
View File

@ -253,10 +253,12 @@ class XmlManifest(object):
else: else:
value = p.work_git.rev_parse(HEAD + '^0') value = p.work_git.rev_parse(HEAD + '^0')
e.setAttribute('revision', value) e.setAttribute('revision', value)
if peg_rev_upstream and value != p.revisionExpr: if peg_rev_upstream:
if p.upstream:
e.setAttribute('upstream', p.upstream)
elif value != p.revisionExpr:
# Only save the origin if the origin is not a sha1, and the default # Only save the origin if the origin is not a sha1, and the default
# isn't our value, and the if the default doesn't already have that # isn't our value
# covered.
e.setAttribute('upstream', p.revisionExpr) e.setAttribute('upstream', p.revisionExpr)
else: else:
revision = self.remotes[remoteName].revision or d.revisionExpr revision = self.remotes[remoteName].revision or d.revisionExpr