[PATCH v2 05/21] update-index: warn in case of split-index incoherency
- From
Christian Couder <christian.couder@gmail.com>
- Date
- Dec 17, 2016, 14:55 UTC
- Message-ID
- <20161217145547.11748-6-chriscool@tuxfamily.org>
- In-Reply-To
- <20161217145547.11748-1-chriscool@tuxfamily.org>
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> --- builtin/update-index.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/builtin/update-index.c b/builtin/update-index.c index b75ea037dd..dc1fd0d44d 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -1098,12 +1098,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:
-- 2.11.0.49.g2414764.dirty