update-index: add untracked cache notifications

diff --git a/builtin/update-index.c b/builtin/update-index.c
index 7431938fa654ba9af524a7018ab2c7be8242caaa..369c20731255afee16428b8e654d9788f2f5b3b5 100644 (file)
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -35,6 +35,15 @@ static int mark_skip_worktree_only;
 #define UNMARK_FLAG 2
 static struct strbuf mtime_dir = STRBUF_INIT;
 
+/* Untracked cache mode */
+enum uc_mode {
+       UC_UNSPECIFIED = -1,
+       UC_DISABLE = 0,
+       UC_ENABLE,
+       UC_TEST,
+       UC_FORCE
+};
+
 __attribute__((format (printf, 1, 2)))
 static void report(const char *fmt, ...)
 {
@@ -121,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);
@@ -902,7 +911,7 @@ static int reupdate_callback(struct parse_opt_ctx_t *ctx,
 int cmd_update_index(int argc, const char **argv, const char *prefix)
 {
        int newfd, entries, has_errors = 0, line_termination = '\n';
-       int untracked_cache = -1;
+       enum uc_mode untracked_cache = UC_UNSPECIFIED;
        int read_from_stdin = 0;
        int prefix_length = prefix ? strlen(prefix) : 0;
        int preferred_index_format = 0;
@@ -996,8 +1005,10 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
                        N_("enable or disable split index")),
                OPT_BOOL(0, "untracked-cache", &untracked_cache,
                        N_("enable/disable untracked cache")),
+               OPT_SET_INT(0, "test-untracked-cache", &untracked_cache,
+                           N_("test if the filesystem supports untracked cache"), UC_TEST),
                OPT_SET_INT(0, "force-untracked-cache", &untracked_cache,
-                           N_("enable untracked cache without testing the filesystem"), 2),
+                           N_("enable untracked cache without testing the filesystem"), UC_FORCE),
                OPT_END()
        };
 
@@ -1104,13 +1115,15 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
                the_index.split_index = NULL;
                the_index.cache_changed |= SOMETHING_CHANGED;
        }
-       if (untracked_cache > 0) {
+       if (untracked_cache > UC_DISABLE) {
                struct untracked_cache *uc;
 
-               if (untracked_cache < 2) {
+               if (untracked_cache < UC_FORCE) {
                        setup_work_tree();
                        if (!test_if_untracked_cache_is_supported())
                                return 1;
+                       if (untracked_cache == UC_TEST)
+                               return 0;
                }
                if (!the_index.untracked) {
                        uc = xcalloc(1, sizeof(*uc));
@@ -1122,9 +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 && 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) {