X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=read-cache.c;h=056b322fb0c83aeda378f548e13f84d4a65c1e29;hb=e2b7eaf0ca3897940961d23392d4ff718867ea9f;hp=56202d13dfcfe4ed583fee7b4063596bc1ef417e;hpb=66d4035e1099477aa488c24c0c081ee764f85868;p=git.git

diff --git a/read-cache.c b/read-cache.c
index 56202d13d..056b322fb 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));
 	}