The core.midx config setting controls the multi-pack-index (MIDX)
feature. If false, the setting will disable all reads from the
multi-pack-index file.
Add comparison commands in t5319-midx.sh to check typical Git behavior
remains the same as the config setting is turned on and off. This
currently includes 'git rev-list' and 'git log' commands to trigger
several object database reads.
Signed-off-by: Derrick Stolee <dstolee@xxxxxxxxxxxxx>
---
Documentation/config.txt | 4 +++
cache.h | 1 +
config.c | 5 ++++
environment.c | 1 +
t/t5319-midx.sh | 57 ++++++++++++++++++++++++++++++++--------
5 files changed, 57 insertions(+), 11 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index ab641bf5a9..e78150e452 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -908,6 +908,10 @@ core.commitGraph::
Enable git commit graph feature. Allows reading from the
commit-graph file.
+core.midx::
+ Enable multi-pack-index feature. Allows reading from the multi-
+ pack-index file.
+
core.sparseCheckout::
Enable "sparse checkout" feature. See section "Sparse checkout" in
linkgit:git-read-tree[1] for more information.
diff --git a/cache.h b/cache.h
index 89a107a7f7..c7967f7643 100644
--- a/cache.h
+++ b/cache.h
@@ -814,6 +814,7 @@ extern char *git_replace_ref_base;
extern int fsync_object_files;
extern int core_preload_index;
extern int core_commit_graph;
+extern int core_midx;
extern int core_apply_sparse_checkout;
extern int precomposed_unicode;
extern int protect_hfs;
diff --git a/config.c b/config.c
index fbbf0f8e9f..0df3dbdf74 100644
--- a/config.c
+++ b/config.c
@@ -1313,6 +1313,11 @@ static int git_default_core_config(const char *var, const char *value)
return 0;
}
+ if (!strcmp(var, "core.midx")) {
+ core_midx = git_config_bool(var, value);
+ return 0;
+ }
+
if (!strcmp(var, "core.sparsecheckout")) {
core_apply_sparse_checkout = git_config_bool(var, value);
return 0;
diff --git a/environment.c b/environment.c
index 2a6de2330b..dcb4417604 100644
--- a/environment.c
+++ b/environment.c
@@ -67,6 +67,7 @@ enum object_creation_mode object_creation_mode = OBJECT_CREATION_MODE;
char *notes_ref_name;
int grafts_replace_parents = 1;
int core_commit_graph;
+int core_midx;
int core_apply_sparse_checkout;
int merge_log_config = -1;
int precomposed_unicode = -1; /* see probe_utf8_pathname_composition() */
diff --git a/t/t5319-midx.sh b/t/t5319-midx.sh
index 709652c635..1a50987778 100755
--- a/t/t5319-midx.sh
+++ b/t/t5319-midx.sh
@@ -3,6 +3,8 @@
test_description='multi-pack-indexes'
. ./test-lib.sh
+objdir=.git/objects
+
midx_read_expect() {
NUM_PACKS=$1
NUM_OBJECTS=$2
@@ -62,13 +64,42 @@ test_expect_success 'write midx with one v1 pack' '
midx_read_expect 1 17 5 .
'
+midx_git_two_modes() {
+ git -c core.midx=false $1 >expect &&
+ git -c core.midx=true $1 >actual &&
+ test_cmp expect actual
+}
+
+compare_results_with_midx() {
+ MSG=$1
+ test_expect_success "check normal git operations: $MSG" '
+ midx_git_two_modes "rev-list --objects --all" &&
+ midx_git_two_modes "log --raw"
+ '
+}
+
test_expect_success 'write midx with one v2 pack' '
- pack=$(git pack-objects --index-version=2,0x40 pack/test <obj-list) &&
- test_when_finished rm pack/test-$pack.pack pack/test-$pack.idx &&
- git midx --object-dir=. write &&
- midx_read_expect 1 17 5 .
+ pack=$(git pack-objects --index-version=2,0x40 $objdir/pack/test <obj-list) &&
+ git midx --object-dir=$objdir write &&
+ midx_read_expect 1 17 5 $objdir
'
+midx_git_two_modes() {
+ git -c core.midx=false $1 >expect &&
+ git -c core.midx=true $1 >actual &&
+ test_cmp expect actual
+}
+
+compare_results_with_midx() {
+ MSG=$1
+ test_expect_success "check normal git operations: $MSG" '
+ midx_git_two_modes "rev-list --objects --all" &&
+ midx_git_two_modes "log --raw"
+ '
+}
+
+compare_results_with_midx "one v2 pack"
+
test_expect_success 'Add more objects' '
for i in `test_seq 6 10`
do
@@ -94,12 +125,13 @@ test_expect_success 'Add more objects' '
'
test_expect_success 'write midx with two packs' '
- pack1=$(git pack-objects --index-version=1 pack/test-1 <obj-list) &&
- pack2=$(git pack-objects --index-version=1 pack/test-2 <obj-list2) &&
- git midx --object-dir=. write &&
- midx_read_expect 2 33 5 .
+ pack2=$(git pack-objects --index-version=1 $objdir/pack/test-2 <obj-list2) &&
+ git midx --object-dir=$objdir write &&
+ midx_read_expect 2 33 5 $objdir
'
+compare_results_with_midx "two packs"
+
test_expect_success 'Add more packs' '
for j in `test_seq 1 10`
do
@@ -120,17 +152,20 @@ test_expect_success 'Add more packs' '
git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\) .*/\\1/"
} >obj-list &&
git update-ref HEAD $commit &&
- git pack-objects --index-version=2 pack/test-pack <obj-list &&
+ git pack-objects --index-version=2 $objdir/pack/test-pack <obj-list &&
i=$(expr $i + 1) || return 1 &&
j=$(expr $j + 1) || return 1
done
'
+compare_results_with_midx "mixed mode (two packs + extra)"
+
test_expect_success 'write midx with twelve packs' '
- git midx --object-dir=. write &&
- midx_read_expect 12 73 5 .
+ git midx --object-dir=$objdir write &&
+ midx_read_expect 12 73 5 $objdir
'
+compare_results_with_midx "twelve packs"
# usage: corrupt_data <file> <pos> [<data>]
corrupt_data() {
--
2.18.0.rc1
