update-index: be specific what part of the index has changed

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/update-index.c b/builtin/update-index.c
index d2654d643ddb87afbdaf8f14d9c854fd12f98f47..e0e881b3e710c36e470e61e909ca84f077c0fbd0 100644 (file)
--- 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);
                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;
                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);
                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:
        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)
                            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;
        }
 
                the_index.version = preferred_index_format;
        }