X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=sha1_name.c;h=3e856b80369c289a3d9399d60ec3be22bbbc6788;hb=5c28a8b054cb69a37638b0261fc370422c8fab58;hp=484081de82928108a23a714a76ea88693e56bdd1;hpb=8cf666c9eea7d6c40784efde545c9d00edea1959;p=git.git diff --git a/sha1_name.c b/sha1_name.c index 484081de8..3e856b803 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -1069,6 +1069,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] != ':' || @@ -1096,6 +1097,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++;