diff options
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 c2fe1aae52..e2d576ad7b 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); |