summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Christian Couder <christian.couder@gmail.com>2017-02-27 19:00:02 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-01 13:24:21 -0800
commit4392531211e48ead6bf2d27c58b208cd1e221eda (patch)
tree594216da4b591ce5979561ba0c5a8806e42ab7ec
parentsplit-index: add {add,remove}_split_index() functions (diff)
downloadtgif-4392531211e48ead6bf2d27c58b208cd1e221eda.tar.xz
read-cache: add and then use tweak_split_index()
This will make us use the split-index feature or not depending on the value of the "core.splitIndex" config variable. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--read-cache.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/read-cache.c b/read-cache.c
index f92a912dcb..732b7fe611 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1566,10 +1566,27 @@ static void tweak_untracked_cache(struct index_state *istate)
}
}
+static void tweak_split_index(struct index_state *istate)
+{
+ switch (git_config_get_split_index()) {
+ case -1: /* unset: do nothing */
+ break;
+ case 0: /* false */
+ remove_split_index(istate);
+ break;
+ case 1: /* true */
+ add_split_index(istate);
+ break;
+ default: /* unknown value: do nothing */
+ break;
+ }
+}
+
static void post_read_index_from(struct index_state *istate)
{
check_ce_order(istate);
tweak_untracked_cache(istate);
+ tweak_split_index(istate);
}
/* remember to discard_cache() before reading a different cache! */