diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2014-06-13 16:19:39 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-13 22:49:40 +0400 |
| commit | 078a58e825d14987df82af9d19c00ddc8eb82481 (patch) | |
| tree | 751e5532832406e8157d89bc3daa1e8434c5c74c /builtin/update-index.c | |
| parent | 045113a53e9e4b2c157040a1b53306d7c932c455 (diff) | |
read-cache: mark updated entries for split index
The large part of this patch just follows CE_ENTRY_CHANGED
marks. replace_index_entry() is updated to update
split_index->base->cache[] as well so base->cache[] does not reference
to a freed entry.
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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/update-index.c b/builtin/update-index.c index fa3c44140d..f7a19c47a6 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -55,6 +55,7 @@ static int mark_ce_flags(const char *path, int flag, int mark) active_cache[pos]->ce_flags |= flag; else active_cache[pos]->ce_flags &= ~flag; + active_cache[pos]->ce_flags |= CE_UPDATE_IN_BASE; cache_tree_invalidate_path(&the_index, path); active_cache_changed |= CE_ENTRY_CHANGED; return 0; @@ -268,6 +269,7 @@ static void chmod_path(int flip, const char *path) goto fail; } cache_tree_invalidate_path(&the_index, path); + ce->ce_flags |= CE_UPDATE_IN_BASE; active_cache_changed |= CE_ENTRY_CHANGED; report("chmod %cx '%s'", flip, path); return; |