diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2014-06-13 14:19:28 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-13 20:49:38 +0200 |
| commit | 782a5ff9cec21b6a4f1f09c80d646b27fb100559 (patch) | |
| tree | 919be792299d7181aed48fc1b87f46d980264585 /builtin/update-index.c | |
| parent | read-cache: be specific what part of the index has changed (diff) | |
| download | git-782a5ff9cec21b6a4f1f09c80d646b27fb100559.tar.xz git-782a5ff9cec21b6a4f1f09c80d646b27fb100559.zip | |
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>
Diffstat (limited to 'builtin/update-index.c')
| -rw-r--r-- | builtin/update-index.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/update-index.c b/builtin/update-index.c index d2654d643d..e0e881b3e7 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; } |