Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge git://git.kernel.org/pub/scm/gitk/gitk
[gitweb.git]
/
read-cache.c
diff --git
a/read-cache.c
b/read-cache.c
index 56202d13dfcfe4ed583fee7b4063596bc1ef417e..056b322fb0c83aeda378f548e13f84d4a65c1e29 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));
}