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:29 +0700
committerJunio C Hamano <gitster@pobox.com>2014-06-13 11:49:38 -0700
commit6c306a34eef49beb3db5500f6f29190c799ace4b (patch)
treea25dafcb898459059477becbac44450e69379704 /resolve-undo.c
parent782a5ff9cec21b6a4f1f09c80d646b27fb100559 (diff)
downloadgit-6c306a34eef49beb3db5500f6f29190c799ace4b.tar.gz
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>
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 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)