X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=read-cache.c;h=928e8fa1aee22a0a79c57ca675576d4998503ea9;hb=154c7d0759b6885034bffa7a34d464d703fc8bb3;hp=536f4d0875ffec13706ef7e14805652f08fcc570;hpb=102c2338da0b0954a04742f5cbe307fa6b49f225;p=git.git

diff --git a/read-cache.c b/read-cache.c
index 536f4d087..928e8fa1a 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -149,6 +149,8 @@ static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st)
 		else if (ce_compare_gitlink(ce))
 			changed |= DATA_CHANGED;
 		return changed;
+	case 0: /* Special case: unmerged file in index */
+		return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED;
 	default:
 		die("internal error: ce_mode is %o", ntohl(ce->ce_mode));
 	}