android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2025-01-16 16:14:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gerrit.googlesource.com/git-repo

Browse Source 
Change-Id: I61afedf75588b0e254c75819865df79e4eea419d
This commit is contained in:
Raman Tenneti 2021-02-07 09:19:36 -08:00
commit a2f7af4b38
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifest_xml.py
View File

@ -403,9 +403,8 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
revision = self.remotes[p.remote.orig_name].revision or d.revisionExpr
if not revision or revision != p.revisionExpr:
e.setAttribute('revision', p.revisionExpr)
else:
if p.revisionId:
e.setAttribute('revision', p.revisionId)
elif p.revisionId:
e.setAttribute('revision', p.revisionId)
if (p.upstream and (p.upstream != p.revisionExpr or
p.upstream != d.upstreamExpr)):
e.setAttribute('upstream', p.upstream)