diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2012-04-14 07:54:33 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-15 21:25:19 (GMT) |
| commit | bb0dab5d617219d7efe8815cadef6d98c4bc3df8 (patch) | |
| tree | 41472887fbae6fea7373ae94380e9ed3115dd233 /sha1_name.c | |
| parent | 9884e67f9d9b511592b981572cfbb30cc50aec61 (diff) | |
| download | git-bb0dab5d617219d7efe8815cadef6d98c4bc3df8.zip git-bb0dab5d617219d7efe8815cadef6d98c4bc3df8.tar.gz git-bb0dab5d617219d7efe8815cadef6d98c4bc3df8.tar.bz2 | |
Provide better message for barnhc_wiht_tpyo@{u}
Instead of just saying that no upstream exists for such branch,
which is true but not very helpful, check that there's no
refs/heads/barnhc_wiht_tpyo and tell it to the user.
Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_name.c')
| -rw-r--r-- | sha1_name.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sha1_name.c b/sha1_name.c index c2fe1aa..e2d576a 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -862,8 +862,11 @@ int interpret_branch_name(const char *name, struct strbuf *buf) */ if (!upstream) return error("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)) + return error("No such branch: '%s'", cp); return error("No upstream branch found for '%s'", upstream->name); + } free(cp); cp = shorten_unambiguous_ref(upstream->merge[0]->dst, 0); strbuf_reset(buf); |