resolve-undo: be specific what part of the index has changed

pclouds · gitster · commit 6c306a34eef4 · 2014-06-13T11:49:38.000-07:00
Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/cache.h b/cache.h
@@ -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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ void resolve_undo_clear_index(struct index_state *istate)`
`110`	`110`	`string_list_clear(resolve_undo, 1);`
`111`	`111`	`free(resolve_undo);`
`112`	`112`	`istate->resolve_undo = NULL;`
`113`		`- istate->cache_changed = SOMETHING_CHANGED;`
	`113`	`+ istate->cache_changed \|= RESOLVE_UNDO_CHANGED;`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`int unmerge_index_entry_at(struct index_state *istate, int pos)`