summaryrefslogtreecommitdiff
path: root/builtin/update-index.c
diff options
context:
space:
mode:
authorChristian Couder <christian.couder@gmail.com>2017-02-27 18:00:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-03-01 21:24:21 (GMT)
commit6cc1053375d8e138b8f05dde4cd0d4ab8f92254a (patch)
tree02cd9b74744ae37fb425dae92992c3216f44b761 /builtin/update-index.c
parent4392531211e48ead6bf2d27c58b208cd1e221eda (diff)
downloadgit-6cc1053375d8e138b8f05dde4cd0d4ab8f92254a.zip
git-6cc1053375d8e138b8f05dde4cd0d4ab8f92254a.tar.gz
git-6cc1053375d8e138b8f05dde4cd0d4ab8f92254a.tar.bz2
update-index: warn in case of split-index incoherency
When users are using `git update-index --(no-)split-index`, they may expect the split-index feature to be used or not according to the option they just used, but this might not be the case if the new "core.splitIndex" config variable has been set. In this case let's warn about what will happen and why. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/update-index.c')
-rw-r--r--builtin/update-index.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 24fdadf..d74d72c 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -1099,12 +1099,21 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
}
if (split_index > 0) {
+ if (git_config_get_split_index() == 0)
+ warning(_("core.splitIndex is set to false; "
+ "remove or change it, if you really want to "
+ "enable split index"));
if (the_index.split_index)
the_index.cache_changed |= SPLIT_INDEX_ORDERED;
else
add_split_index(&the_index);
- } else if (!split_index)
+ } else if (!split_index) {
+ if (git_config_get_split_index() == 1)
+ warning(_("core.splitIndex is set to true; "
+ "remove or change it, if you really want to "
+ "disable split index"));
remove_split_index(&the_index);
+ }
switch (untracked_cache) {
case UC_UNSPECIFIED: