summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-07-27 12:21:38 -0700
committerJunio C Hamano <gitster@pobox.com>2015-07-27 12:21:38 -0700
commitde62fe8c421344c34d375fc315f33eeb584ab538 (patch)
tree262646e6412478d81e7457c284b9b57edc6152a9
parentbb3e7b1a5505bae590b0d85a3995a61d6dd82547 (diff)
parent0eeb077be7d526635995e17808927c94c70be665 (diff)
downloadgit-de62fe8c421344c34d375fc315f33eeb584ab538.tar.gz
Merge branch 'jk/index-pack-reduce-recheck' into maint
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
-rw-r--r--builtin/index-pack.c2
-rw-r--r--cache.h11
-rw-r--r--sha1_file.c4
3 files changed, 14 insertions, 3 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index cf654df09b..723fe8e11d 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -730,7 +730,7 @@ static void sha1_object(const void *data, struct object_entry *obj_entry,
assert(data || obj_entry);
read_lock();
- collision_test_needed = has_sha1_file(sha1);
+ collision_test_needed = has_sha1_file_with_flags(sha1, HAS_SHA1_QUICK);
read_unlock();
if (collision_test_needed && !data) {
diff --git a/cache.h b/cache.h
index badf3da340..4427945bc0 100644
--- a/cache.h
+++ b/cache.h
@@ -901,8 +901,17 @@ extern int has_sha1_pack(const unsigned char *sha1);
* Return true iff we have an object named sha1, whether local or in
* an alternate object database, and whether packed or loose. This
* function does not respect replace references.
+ *
+ * If the QUICK flag is set, do not re-check the pack directory
+ * when we cannot find the object (this means we may give a false
+ * negative answer if another process is simultaneously repacking).
*/
-extern int has_sha1_file(const unsigned char *sha1);
+#define HAS_SHA1_QUICK 0x1
+extern int has_sha1_file_with_flags(const unsigned char *sha1, int flags);
+static inline int has_sha1_file(const unsigned char *sha1)
+{
+ return has_sha1_file_with_flags(sha1, 0);
+}
/*
* Return true iff an alternate object database has a loose object
diff --git a/sha1_file.c b/sha1_file.c
index 56c69cebc8..0c70152c17 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -3084,7 +3084,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;
@@ -3092,6 +3092,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);
}