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

Only check merge destination if it isn't None

Browse Source 
Change-Id: Ifb1dcd07142933489e93a1f4f03e38289087b609
This commit is contained in:
Conley Owens 2013-10-15 12:59:00 -07:00
parent 37128b6f70
commit fbd3f2a10b
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
subcmds/upload.py
View File

@ -349,15 +349,16 @@ Gerrit Code Review: http://code.google.com/p/gerrit/
# Make sure our local branch is not setup to track a different remote branch # Make sure our local branch is not setup to track a different remote branch
merge_branch = self._GetMergeBranch(branch.project) merge_branch = self._GetMergeBranch(branch.project)
full_dest = 'refs/heads/%s' % destination if destination:
if not opt.dest_branch and merge_branch and merge_branch != full_dest: full_dest = 'refs/heads/%s' % destination
print('merge branch %s does not match destination branch %s' if not opt.dest_branch and merge_branch and merge_branch != full_dest:
% (merge_branch, full_dest)) print('merge branch %s does not match destination branch %s'
print('skipping upload.') % (merge_branch, full_dest))
print('Please use `--destination %s` if this is intentional' print('skipping upload.')
% destination) print('Please use `--destination %s` if this is intentional'
branch.uploaded = False % destination)
continue branch.uploaded = False
continue
branch.UploadForReview(people, auto_topic=opt.auto_topic, draft=opt.draft, dest_branch=destination) branch.UploadForReview(people, auto_topic=opt.auto_topic, draft=opt.draft, dest_branch=destination)
branch.uploaded = True branch.uploaded = True