summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-01-12 14:02:05 -0800
committerJunio C Hamano <gitster@pobox.com>2015-01-12 14:02:05 -0800
commitefc028b1f2c6da6558094326083f7643453bfccd (patch)
tree3f7be6199e8d88725014886cb6d2fa26a1efe42c
parent9ea21fa89c3b0762189d2d6e4689b8e09940aad4 (diff)
parent61e704e38a4c3e181403a766c5cf28814e4102e4 (diff)
downloadgit-efc028b1f2c6da6558094326083f7643453bfccd.tar.gz
Merge branch 'mh/find-uniq-abbrev' into maint
* mh/find-uniq-abbrev: sha1_name: avoid unnecessary sha1 lookup in find_unique_abbrev
-rw-r--r--sha1_name.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_name.c b/sha1_name.c
index 5b004f513b..cb88170252 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -372,10 +372,10 @@ const char *find_unique_abbrev(const unsigned char *sha1, int len)
int status, exists;
static char hex[41];
- exists = has_sha1_file(sha1);
memcpy(hex, sha1_to_hex(sha1), 40);
if (len == 40 || !len)
return hex;
+ exists = has_sha1_file(sha1);
while (len < 40) {
unsigned char sha1_ret[20];
status = get_short_sha1(hex, len, sha1_ret, GET_SHA1_QUIETLY);