Git 1.7.11-rc1

diff --git a/sha1_name.c b/sha1_name.c
index e2d576ad7b86f967e4986dd7792e8d6e18a80350..c6331136d19c5224078fa78b6e5e794fcc587fe2 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -861,11 +861,16 @@ int interpret_branch_name(const char *name, struct strbuf *buf)
         * points to something different than a branch.
         */
        if (!upstream)
-               return error("HEAD does not point to a branch");
+               return error(_("HEAD does not point to a branch"));
        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);
+                       return error(_("No such branch: '%s'"), cp);
+               if (!upstream->merge)
+                       return error(_("No upstream configured for branch '%s'"),
+                                    upstream->name);
+               return error(
+                       _("Upstream branch '%s' not stored as a remote-tracking branch"),
+                       upstream->merge[0]->src);
        }
        free(cp);
        cp = shorten_unambiguous_ref(upstream->merge[0]->dst, 0);