diff --git a/subcmds/upload.py b/subcmds/upload.py index cf3c8a9f..3dd9fd25 100644 --- a/subcmds/upload.py +++ b/subcmds/upload.py @@ -23,6 +23,7 @@ from command import InteractiveCommand from editor import Editor from error import HookError, UploadError from git_command import GitCommand +from git_refs import R_HEADS from project import RepoHook from pyversion import is_python3 @@ -462,7 +463,10 @@ Gerrit Code Review: https://www.gerritcodereview.com/ # Make sure our local branch is not setup to track a different remote branch merge_branch = self._GetMergeBranch(branch.project) if destination: - full_dest = 'refs/heads/%s' % destination + full_dest = destination + if not full_dest.startswith(R_HEADS): + full_dest = R_HEADS + full_dest + if not opt.dest_branch and merge_branch and merge_branch != full_dest: print('merge branch %s does not match destination branch %s' % (merge_branch, full_dest))