diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2014-06-13 16:19:29 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-13 22:49:38 +0400 |
| commit | 6c306a34eef49beb3db5500f6f29190c799ace4b (patch) | |
| tree | a25dafcb898459059477becbac44450e69379704 | |
| parent | 782a5ff9cec21b6a4f1f09c80d646b27fb100559 (diff) | |
resolve-undo: 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>
| -rw-r--r-- | cache.h | 1 | ||||
| -rw-r--r-- | resolve-undo.c | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -272,6 +272,7 @@ static inline unsigned int canon_mode(unsigned int mode) #define CE_ENTRY_CHANGED (1 << 1) #define CE_ENTRY_REMOVED (1 << 2) #define CE_ENTRY_ADDED (1 << 3) +#define RESOLVE_UNDO_CHANGED (1 << 4) struct index_state { struct cache_entry **cache; diff --git a/resolve-undo.c b/resolve-undo.c index e9dff57824..468a2eb92c 100644 --- a/resolve-undo.c +++ b/resolve-undo.c @@ -110,7 +110,7 @@ void resolve_undo_clear_index(struct index_state *istate) string_list_clear(resolve_undo, 1); free(resolve_undo); istate->resolve_undo = NULL; - istate->cache_changed = SOMETHING_CHANGED; + istate->cache_changed |= RESOLVE_UNDO_CHANGED; } int unmerge_index_entry_at(struct index_state *istate, int pos) |