Merge branch 'nd/exclude-workaround-top-heavy'

diff --git a/sha1_name.c b/sha1_name.c
index e2d576ad7b86f967e4986dd7792e8d6e18a80350..5d81ea0564c8d90b417eb8ec5ed8c32baa2c3ea3 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);
@@ -1122,7 +1127,7 @@ int get_sha1_with_context_1(const char *name, unsigned char *sha1,
                        if (new_filename)
                                filename = new_filename;
                        ret = get_tree_entry(tree_sha1, filename, sha1, &oc->mode);
-                       if (only_to_die) {
+                       if (ret && only_to_die) {
                                diagnose_invalid_sha1_path(prefix, filename,
                                                           tree_sha1, object_name);
                                free(object_name);