Provide better message for barnhc_wiht_tpyo@{u}

diff --git a/sha1_name.c b/sha1_name.c
index c2fe1aae523cd077000a333febcbb1ce4be27c77..e2d576ad7b86f967e4986dd7792e8d6e18a80350 100644 (file)
--- 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);