diff options
| author | Brodie Rao <brodie@sf.io> | 2014-01-06 19:32:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-07 09:51:56 -0800 |
| commit | 832cf74c0792a58c9c28e32a8fe5dbb694f0cce6 (patch) | |
| tree | 3b6a5b33ce61f80d935028818c65f5a160ec8921 | |
| parent | c90d3dbe7db37f298e7ce858cfc4c494113f8945 (diff) | |
| download | git-832cf74c0792a58c9c28e32a8fe5dbb694f0cce6.tar.gz git-832cf74c0792a58c9c28e32a8fe5dbb694f0cce6.tar.xz | |
sha1_name: don't resolve refs when core.warnambiguousrefs is false
When seeing a full 40-hex object name, get_sha1_basic()
unconditionally checks if the string can also be interpreted as a
refname, but the result will not be used unless warn_ambiguous_refs
is in effect.
Omitting this unnecessary ref resolution provides a substantial
performance improvement, especially when passing many hashes to a
command (like "git rev-list --stdin") and core.warnambiguousrefs is
set to false. The check incurs 6 stat()s for every hash supplied,
which can be costly over NFS.
Signed-off-by: Brodie Rao <brodie@sf.io>
Acked-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | sha1_name.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sha1_name.c b/sha1_name.c index e9c299943..10bd00716 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -451,9 +451,9 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1) int at, reflog_len, nth_prior = 0; if (len == 40 && !get_sha1_hex(str, sha1)) { - if (warn_on_object_refname_ambiguity) { + if (warn_ambiguous_refs && warn_on_object_refname_ambiguity) { refs_found = dwim_ref(str, len, tmp_sha1, &real_ref); - if (refs_found > 0 && warn_ambiguous_refs) { + if (refs_found > 0) { warning(warn_msg, len, str); if (advice_object_name_warning) fprintf(stderr, "%s\n", _(object_name_msg)); |