summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2014-06-13 19:19:27 +0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-06-13 11:49:38 -0700
commite636a7b4d0304608fe063ffcbbaf99e46f23dbea (patch)
treeb49b7a71aa55fe85073c4fb4813581e4d9008315 /builtin
parentread-cache: be strict about "changed" in remove_marked_cache_entries() (diff)
downloadtgif-e636a7b4d0304608fe063ffcbbaf99e46f23dbea.tar.xz
read-cache: be specific what part of the index has changed
cache entry additions, removals and modifications are separated out. The rest of changes are still in the catch-all flag SOMETHING_CHANGED, which would be more specific later. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/update-index.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 42cbe4ba1e..d2654d643d 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -56,7 +56,7 @@ static int mark_ce_flags(const char *path, int flag, int mark)
else
active_cache[pos]->ce_flags &= ~flag;
cache_tree_invalidate_path(active_cache_tree, path);
- active_cache_changed = 1;
+ active_cache_changed = SOMETHING_CHANGED;
return 0;
}
return -1;
@@ -268,7 +268,7 @@ static void chmod_path(int flip, const char *path)
goto fail;
}
cache_tree_invalidate_path(active_cache_tree, path);
- active_cache_changed = 1;
+ active_cache_changed = SOMETHING_CHANGED;
report("chmod %cx '%s'", flip, path);
return;
fail:
@@ -889,7 +889,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
INDEX_FORMAT_LB, INDEX_FORMAT_UB);
if (the_index.version != preferred_index_format)
- active_cache_changed = 1;
+ active_cache_changed = SOMETHING_CHANGED;
the_index.version = preferred_index_format;
}