summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2014-06-13 19:19:49 +0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-06-13 11:49:42 -0700
commitd6e3c181bc94e3f540c403eef0515c5eed74fc16 (patch)
treefbc510d71c3bc46c74398e89a669d3599a518da1
parentread-tree: note about dropping split-index mode or index version (diff)
downloadtgif-d6e3c181bc94e3f540c403eef0515c5eed74fc16.tar.xz
read-cache: force split index mode with GIT_TEST_SPLIT_INDEX
This could be used to run the whole test suite with split indexes. Index splitting is carried out at random. "git read-tree" also resets the index and forces splitting at the next update. I had a lot of headaches with the test suite, which proves it exercises split index pretty good. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--read-cache.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/read-cache.c b/read-cache.c
index b1027f7ee0..12335a362b 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1885,8 +1885,11 @@ static int do_write_index(struct index_state *istate, int newfd,
}
}
- if (!istate->version)
+ if (!istate->version) {
istate->version = get_index_format_default();
+ if (getenv("GIT_TEST_SPLIT_INDEX"))
+ init_split_index(istate);
+ }
/* demote version 3 to version 2 when the latter suffices */
if (istate->version == 3 || istate->version == 2)
@@ -2077,6 +2080,11 @@ int write_locked_index(struct index_state *istate, struct lock_file *lock,
return do_write_locked_index(istate, lock, flags);
}
+ if (getenv("GIT_TEST_SPLIT_INDEX")) {
+ int v = si->base_sha1[0];
+ if ((v & 15) < 6)
+ istate->cache_changed |= SPLIT_INDEX_ORDERED;
+ }
if (istate->cache_changed & SPLIT_INDEX_ORDERED) {
int ret = write_shared_index(istate, lock, flags);
if (ret)