Provide branch name in error message when using @{u}

diff --git a/sha1_name.c b/sha1_name.c
index 03ffc2caaa6524a3361bc47a89e101ced2f0e987..c2fe1aae523cd077000a333febcbb1ce4be27c77 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -856,10 +856,14 @@ int interpret_branch_name(const char *name, struct strbuf *buf)
        len = cp + tmp_len - name;
        cp = xstrndup(name, cp - name);
        upstream = branch_get(*cp ? cp : NULL);
-       if (!upstream
-           || !upstream->merge
-           || !upstream->merge[0]->dst)
-               return error("No upstream branch found for '%s'", cp);
+       /*
+        * Upstream can be NULL only if cp refers to HEAD and HEAD
+        * points to something different than a branch.
+        */
+       if (!upstream)
+               return error("HEAD does not point to a branch");
+       if (!upstream->merge || !upstream->merge[0]->dst)
+               return error("No upstream branch found for '%s'", upstream->name);
        free(cp);
        cp = shorten_unambiguous_ref(upstream->merge[0]->dst, 0);
        strbuf_reset(buf);