diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-12-22 12:26:57 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-22 12:26:58 -0800 |
| commit | 5109f2aaabcd7ce2c493bb663417c2dd4d5b81fe (patch) | |
| tree | 7178b9d85944107b4aacc594682cfdf5c5f81f94 /sha1_name.c | |
| parent | 2374f1dfd12542d171b60065dc139a96cb0efe29 (diff) | |
| parent | 61e704e38a4c3e181403a766c5cf28814e4102e4 (diff) | |
| download | git-5109f2aaabcd7ce2c493bb663417c2dd4d5b81fe.tar.gz | |
Merge branch 'mh/find-uniq-abbrev'
The code to abbreviate an object name to its short unique prefix
has been optimized when no abbreviation was requested.
* mh/find-uniq-abbrev:
sha1_name: avoid unnecessary sha1 lookup in find_unique_abbrev
Diffstat (limited to 'sha1_name.c')
| -rw-r--r-- | sha1_name.c | 2 |
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); |