summaryrefslogtreecommitdiff
path: root/sha1_file.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-24 19:21:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-24 19:21:54 (GMT)
commit712b351bd37d4e4676d1165993cad4cc2176b346 (patch)
treea81d157a57664f19b32d5fe9e704c3585af78b0b /sha1_file.c
parentc595cb9c4f7c5fb2b09c5f3d3c07cf4488dc7ef9 (diff)
parent0eeb077be7d526635995e17808927c94c70be665 (diff)
downloadgit-712b351bd37d4e4676d1165993cad4cc2176b346.zip
git-712b351bd37d4e4676d1165993cad4cc2176b346.tar.gz
git-712b351bd37d4e4676d1165993cad4cc2176b346.tar.bz2
Merge branch 'jk/index-pack-reduce-recheck'
Disable "have we lost a race with competing repack?" check while receiving a huge object transfer that runs index-pack. * jk/index-pack-reduce-recheck: index-pack: avoid excessive re-reading of pack directory
Diffstat (limited to 'sha1_file.c')
-rw-r--r--sha1_file.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sha1_file.c b/sha1_file.c
index 5038475..77cd81d 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -3168,7 +3168,7 @@ int has_sha1_pack(const unsigned char *sha1)
return find_pack_entry(sha1, &e);
}
-int has_sha1_file(const unsigned char *sha1)
+int has_sha1_file_with_flags(const unsigned char *sha1, int flags)
{
struct pack_entry e;
@@ -3176,6 +3176,8 @@ int has_sha1_file(const unsigned char *sha1)
return 1;
if (has_loose_object(sha1))
return 1;
+ if (flags & HAS_SHA1_QUICK)
+ return 0;
reprepare_packed_git();
return find_pack_entry(sha1, &e);
}