Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

diff --git a/read-cache.c b/read-cache.c
index 536f4d0875ffec13706ef7e14805652f08fcc570..928e8fa1aee22a0a79c57ca675576d4998503ea9 100644 (file)
--- 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));
        }