update-index: add untracked cache notifications

Attempting to flip the untracked-cache feature on for a random index
file with

cd /random/unrelated/place
git --git-dir=/somewhere/else/.git update-index --untracked-cache

would not work as you might expect. Because flipping the feature on
in the index also records the location of the corresponding working
tree (/random/unrelated/place in the above example), when the index
is subsequently used to keep track of files in the working tree in
/somewhere/else, the feature is disabled.

With this patch "git update-index --[test-]untracked-cache" tells the
user in which directory tests are performed. This makes it easy to
spot any problem.

Also in verbose mode, let's tell the user when the cache is enabled
or disabled.

Helped-by: Duy Nguyen <pclouds@gmail.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/update-index.c b/builtin/update-index.c
index 62222dd8c73aadd762305f6a8be0a714c3055a9a..369c20731255afee16428b8e654d9788f2f5b3b5 100644 (file)
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -130,7 +130,7 @@ static int test_if_untracked_cache_is_supported(void)
        if (!mkdtemp(mtime_dir.buf))
                die_errno("Could not make temporary directory");
 
-       fprintf(stderr, _("Testing "));
+       fprintf(stderr, _("Testing mtime in '%s' "), xgetcwd());
        atexit(remove_test_directory);
        xstat_mtime_dir(&st);
        fill_stat_data(&base, &st);
@@ -1135,10 +1135,14 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
                }
                add_untracked_ident(the_index.untracked);
                the_index.cache_changed |= UNTRACKED_CHANGED;
-       } else if (untracked_cache == UC_DISABLE && the_index.untracked) {
-               free_untracked_cache(the_index.untracked);
-               the_index.untracked = NULL;
-               the_index.cache_changed |= UNTRACKED_CHANGED;
+               report(_("Untracked cache enabled for '%s'"), get_git_work_tree());
+       } else if (untracked_cache == UC_DISABLE) {
+               if (the_index.untracked) {
+                       free_untracked_cache(the_index.untracked);
+                       the_index.untracked = NULL;
+                       the_index.cache_changed |= UNTRACKED_CHANGED;
+               }
+               report(_("Untracked cache disabled"));
        }
 
        if (active_cache_changed) {