Merge branch 'jc/abbrev-guard'

diff --git a/sha1_name.c b/sha1_name.c
index 4a226adeceaff62f8d10e905149a05ef3c2d894c..b48b91c507e597405274dc5aa3edc98ee5149bdc 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -1071,6 +1071,7 @@ int get_sha1_with_context_1(const char *name, unsigned char *sha1,
                struct cache_entry *ce;
                int pos;
                if (namelen > 2 && name[1] == '/')
+                       /* don't need mode for commit */
                        return get_sha1_oneline(name + 2, sha1);
                if (namelen < 3 ||
                    name[2] != ':' ||
@@ -1098,6 +1099,7 @@ int get_sha1_with_context_1(const char *name, unsigned char *sha1,
                                break;
                        if (ce_stage(ce) == stage) {
                                hashcpy(sha1, ce->sha1);
+                               oc->mode = ce->ce_mode;
                                return 0;
                        }
                        pos++;