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>
Nguyễn Thái Ngọc Duy committed
Jun 13, 2014 at 19:19 UTC
6c306a34eef49beb3db5500f6f29190c799ace4b
2 files changed
+2
-1
cache.h
+1
@@ -272,6 +272,7 @@ static inline unsigned int canon_mode(unsigned int mode)
272
#define CE_ENTRY_CHANGED (1 << 1)
273
#define CE_ENTRY_REMOVED (1 << 2)
274
#define CE_ENTRY_ADDED (1 << 3)
275
+#define RESOLVE_UNDO_CHANGED (1 << 4)
276
277
struct index_state {
278
struct cache_entry **cache;
resolve-undo.c
+1
-1
@@ -110,7 +110,7 @@ void resolve_undo_clear_index(struct index_state *istate)
110
string_list_clear(resolve_undo, 1);
111
free(resolve_undo);
112
istate->resolve_undo = NULL;
113
- istate->cache_changed = SOMETHING_CHANGED;
113
+ istate->cache_changed |= RESOLVE_UNDO_CHANGED;
114
}
115
116
int unmerge_index_entry_at(struct index_state *istate, int pos)