summaryrefslogtreecommitdiff
path: root/read-cache.c
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-10-18 03:11:17 -0400
committerShawn O. Pearce <spearce@spearce.org>2007-10-18 03:11:17 -0400
commite75c55844fd0ff96d00173574b1e49cc472ca928 (patch)
tree1146c04d598cdb0857e9072e82eee2338f8ee4a4 /read-cache.c
parent8f353ee57a2f79697f8dea80ad3174998586bc75 (diff)
parent1aa3d01f870a68dc46a872c83f9cd051f172f9b3 (diff)
downloadgit-e75c55844fd0ff96d00173574b1e49cc472ca928.tar.gz
Merge branch 'maint'
* maint: Yet more 1.5.3.5 fixes mentioned in release notes cvsserver: Use exit 1 instead of die when req_Root fails. git-blame shouldn't crash if run in an unmerged tree git-config: print error message if the config file cannot be read fixing output of non-fast-forward output of post-receive-email
Diffstat (limited to 'read-cache.c')
-rw-r--r--read-cache.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/read-cache.c b/read-cache.c
index 56202d13df..056b322fb0 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));
}