summaryrefslogtreecommitdiff
path: root/resolve-undo.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2014-06-13 19:19:27 +0700
committerJunio C Hamano <gitster@pobox.com>2014-06-13 11:49:38 -0700
commite636a7b4d0304608fe063ffcbbaf99e46f23dbea (patch)
treeb49b7a71aa55fe85073c4fb4813581e4d9008315 /resolve-undo.c
parentad837d9ef9d555ab5077767c8672ff48c6cb562b (diff)
downloadgit-e636a7b4d0304608fe063ffcbbaf99e46f23dbea.tar.gz
read-cache: be specific what part of the index has changed
cache entry additions, removals and modifications are separated out. The rest of changes are still in the catch-all flag SOMETHING_CHANGED, which would be more specific later. 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 'resolve-undo.c')
-rw-r--r--resolve-undo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/resolve-undo.c b/resolve-undo.c
index 44c697c36d..e9dff57824 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 = 1;
+ istate->cache_changed = SOMETHING_CHANGED;
}
int unmerge_index_entry_at(struct index_state *istate, int pos)