summaryrefslogtreecommitdiff
path: root/builtin/update-index.c
diff options
context:
space:
mode:
authorChristian Couder <christian.couder@gmail.com>2016-01-24 15:28:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-01-25 20:39:34 (GMT)
commit6d19db1491f1f48c5112f460e1f2d2e359e113c9 (patch)
tree1ed08cbf40630b39e9322fe0a5196a27fc7e1ebd /builtin/update-index.c
parenteaab83d0e574c9f3440a2364a7975f9ffe75f188 (diff)
downloadgit-6d19db1491f1f48c5112f460e1f2d2e359e113c9.zip
git-6d19db1491f1f48c5112f460e1f2d2e359e113c9.tar.gz
git-6d19db1491f1f48c5112f460e1f2d2e359e113c9.tar.bz2
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>
Diffstat (limited to 'builtin/update-index.c')
-rw-r--r--builtin/update-index.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 62222dd..369c207 100644
--- 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) {