diff options
| author | Mike Frysinger <vapier@google.com> | 2020-11-10 01:09:51 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@google.com> | 2020-11-16 23:13:02 +0000 |
| commit | 160748f828f0fdaf09d3be86c73840d9e28eccdb (patch) | |
| tree | dcbd3969cf0f767f341465e3af1398e1b96534d7 | |
| parent | 6e89c965f40860f93389b919b4d7f190beb707f7 (diff) | |
| download | git-repo-160748f828f0fdaf09d3be86c73840d9e28eccdb.tar.gz git-repo-160748f828f0fdaf09d3be86c73840d9e28eccdb.zip | |
upload: improve tip for fixing upload remote
Instead of assuming the repo client is tracking the "master" branch
of the manifest repo, use the existing info we have to display the
right info to the user.
Bug: https://crbug.com/gerrit/13339
Change-Id: I8b265f4b2e075fdc41909b1f3dff9aee87384353
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/287279
Reviewed-by: Michael Mortensen <mmortensen@google.com>
Tested-by: Mike Frysinger <vapier@google.com>
| -rw-r--r-- | subcmds/upload.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/subcmds/upload.py b/subcmds/upload.py index cc6ccf74f..f441aae47 100644 --- a/subcmds/upload.py +++ b/subcmds/upload.py @@ -554,10 +554,10 @@ Gerrit Code Review: https://www.gerritcodereview.com/ avail = [up_branch] else: avail = None - print('ERROR: Current branch (%s) not uploadable. ' - 'You may be able to type ' - '"git branch --set-upstream-to m/master" to fix ' - 'your branch.' % str(cbr), + print('repo: error: Unable to upload branch "%s". ' + 'You might be able to fix the branch by running:\n' + ' git branch --set-upstream-to m/%s' % + (str(cbr), self.manifest.branch), file=sys.stderr) else: avail = project.GetUploadableBranches(branch) |