From: Nguyễn Thái Ngọc Duy Date: Fri, 13 Jun 2014 12:19:29 +0000 (+0700) Subject: resolve-undo: be specific what part of the index has changed X-Git-Tag: v2.1.0-rc0~45^2~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c306a34eef49beb3db5500f6f29190c799ace4b;p=thirdparty%2Fgit.git resolve-undo: be specific what part of the index has changed Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff --git a/cache.h b/cache.h index 31d4541bc6..976f2e0c33 100644 --- 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 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)