[RFC/PATCH 4/8] update-index: warn in case of split-index incoherency
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
builtin/update-index.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/builtin/update-index.c b/builtin/update-index.c
index f06fe80..2b8aaa6 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -1108,10 +1108,19 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
strbuf_release(&buf);
}
- if (split_index > 0)
+ 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");
add_split_index(&the_index);
- else if (!split_index && the_index.split_index)
+ } else if (!split_index && the_index.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:
--
2.9.0.250.g7087ccc.dirty
Christian Couder <christian.couder@gmail.com>