From: Nguyễn Thái Ngọc Duy Date: Fri, 13 Jun 2014 12:19:28 GMT Subject: [PATCH 09/32] update-index: be specific what part of the index has changed Message-ID: <1402661991-14977-10-git-send-email-pclouds@gmail.com> In-Reply-To: <1402661991-14977-1-git-send-email-pclouds@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/update-index.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/update-index.c b/builtin/update-index.c index d2654d6..e0e881b 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 = SOMETHING_CHANGED; + active_cache_changed |= CE_ENTRY_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 = SOMETHING_CHANGED; + active_cache_changed |= CE_ENTRY_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 = SOMETHING_CHANGED; + active_cache_changed |= SOMETHING_CHANGED; the_index.version = preferred_index_format; } -- 1.9.1.346.ga2b5940