mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 10:26:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

sha1_name: fix error message for @{u}

Browse Source 
Currently, when no (valid) upstream is configured for a branch, you get
an error like:

  $ git show @{u}
  error: No upstream configured for branch 'upstream-error'
  error: No upstream configured for branch 'upstream-error'
  fatal: ambiguous argument '@{u}': unknown revision or path not in the working tree.
  Use '--' to separate paths from revisions, like this:
  'git <command> [<revision>...] -- [<file>...]'

The "error: " line actually appears twice, and the rest of the error
message is useless.  In sha1_name.c:interpret_branch_name(), there is
really no point in processing further if @{u} couldn't be resolved, and
we might as well die() instead of returning an error().  After making
this change, you get:

  $ git show @{u}
  fatal: No upstream configured for branch 'upstream-error'

Also tweak a few tests in t1507 to expect this output.

This only turns error() that may be called after we know we are
dealing with an @{upstream} marker into die(), without touching
silent error returns "return -1" from the function.  Any caller that
wants to handle an error condition itself will not be hurt by this
change, unless they want to see the message from error() and then
exit silently without giving its own message, which needs to be
fixed anyway.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ramkumar Ramachandra 2013-05-22 16:09:54 +05:30 committed by Junio C Hamano
parent 9134a460e3
commit 17bf4ff3cd
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sha1_name.c
View File

@ -1033,14 +1033,15 @@ int interpret_branch_name(const char *name, struct strbuf *buf)
* points to something different than a branch. * points to something different than a branch.
*/ */
if (!upstream) if (!upstream)
return error(_("HEAD does not point to a branch")); die(_("HEAD does not point to a branch"));
if (!upstream->merge || !upstream->merge[0]->dst) { if (!upstream->merge || !upstream->merge[0]->dst) {
if (!ref_exists(upstream->refname)) if (!ref_exists(upstream->refname))
return error(_("No such branch: '%s'"), cp); die(_("No such branch: '%s'"), cp);
if (!upstream->merge) if (!upstream->merge) {
return error(_("No upstream configured for branch '%s'"), die(_("No upstream configured for branch '%s'"),
upstream->name); upstream->name);
return error( }
die(
_("Upstream branch '%s' not stored as a remote-tracking branch"), _("Upstream branch '%s' not stored as a remote-tracking branch"),
upstream->merge[0]->src); upstream->merge[0]->src);
} }

15
t/t1507-rev-parse-upstream.sh
View File

@ -129,8 +129,7 @@ test_expect_success 'branch@{u} works when tracking a local branch' '
test_expect_success 'branch@{u} error message when no upstream' ' test_expect_success 'branch@{u} error message when no upstream' '
cat >expect <<-EOF && cat >expect <<-EOF &&
error: No upstream configured for branch ${sq}non-tracking${sq} fatal: No upstream configured for branch ${sq}non-tracking${sq}
fatal: Needed a single revision
EOF EOF
error_message non-tracking@{u} 2>actual && error_message non-tracking@{u} 2>actual &&
test_i18ncmp expect actual test_i18ncmp expect actual
@ -138,8 +137,7 @@ test_expect_success 'branch@{u} error message when no upstream' '
test_expect_success '@{u} error message when no upstream' ' test_expect_success '@{u} error message when no upstream' '
cat >expect <<-EOF && cat >expect <<-EOF &&
error: No upstream configured for branch ${sq}master${sq} fatal: No upstream configured for branch ${sq}master${sq}
fatal: Needed a single revision
EOF EOF
test_must_fail git rev-parse --verify @{u} 2>actual && test_must_fail git rev-parse --verify @{u} 2>actual &&
test_i18ncmp expect actual test_i18ncmp expect actual
@ -147,8 +145,7 @@ test_expect_success '@{u} error message when no upstream' '
test_expect_success 'branch@{u} error message with misspelt branch' ' test_expect_success 'branch@{u} error message with misspelt branch' '
cat >expect <<-EOF && cat >expect <<-EOF &&
error: No such branch: ${sq}no-such-branch${sq} fatal: No such branch: ${sq}no-such-branch${sq}
fatal: Needed a single revision
EOF EOF
error_message no-such-branch@{u} 2>actual && error_message no-such-branch@{u} 2>actual &&
test_i18ncmp expect actual test_i18ncmp expect actual
@ -156,8 +153,7 @@ test_expect_success 'branch@{u} error message with misspelt branch' '
test_expect_success '@{u} error message when not on a branch' ' test_expect_success '@{u} error message when not on a branch' '
cat >expect <<-EOF && cat >expect <<-EOF &&
error: HEAD does not point to a branch fatal: HEAD does not point to a branch
fatal: Needed a single revision
EOF EOF
git checkout HEAD^0 && git checkout HEAD^0 &&
test_must_fail git rev-parse --verify @{u} 2>actual && test_must_fail git rev-parse --verify @{u} 2>actual &&
@ -166,8 +162,7 @@ test_expect_success '@{u} error message when not on a branch' '
test_expect_success 'branch@{u} error message if upstream branch not fetched' ' test_expect_success 'branch@{u} error message if upstream branch not fetched' '
cat >expect <<-EOF && cat >expect <<-EOF &&
error: Upstream branch ${sq}refs/heads/side${sq} not stored as a remote-tracking branch fatal: Upstream branch ${sq}refs/heads/side${sq} not stored as a remote-tracking branch
fatal: Needed a single revision
EOF EOF
error_message bad-upstream@{u} 2>actual && error_message bad-upstream@{u} 2>actual &&
test_i18ncmp expect actual test_i18ncmp expect actual