path: root/entry.c
diff options
authorDuy Nguyen <>2018-08-17 18:00:39 (GMT)
committerJunio C Hamano <>2018-08-17 19:10:37 (GMT)
commitb878579ae755e3a9d200093ced59ada3eaafb08c (patch)
treed7138412cf388250032989b8d76a7a643011773d /entry.c
parentffc6fa0e396238de3a30623912980263b4f283ab (diff)
clone: report duplicate entries on case-insensitive filesystems
Paths that only differ in case work fine in a case-sensitive filesystems, but if those repos are cloned in a case-insensitive one, you'll get problems. The first thing to notice is "git status" will never be clean with no indication what exactly is "dirty". This patch helps the situation a bit by pointing out the problem at clone time. Even though this patch talks about case sensitivity, the patch makes no assumption about folding rules by the filesystem. It simply observes that if an entry has been already checked out at clone time when we're about to write a new path, some folding rules are behind this. In the case that we can't rely on filesystem (via inode number) to do this check, fall back to fspathcmp() which is not perfect but should not give false positives. This patch is tested with vim-colorschemes and Sublime-Gitignore repositories on a JFS partition with case insensitive support on Linux. Signed-off-by: Nguyễn Thái Ngọc Duy <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'entry.c')
1 files changed, 31 insertions, 0 deletions
diff --git a/entry.c b/entry.c
index b5d1d3c..8766e27 100644
--- a/entry.c
+++ b/entry.c
@@ -399,6 +399,34 @@ static int check_path(const char *path, int len, struct stat *st, int skiplen)
return lstat(path, st);
+static void mark_colliding_entries(const struct checkout *state,
+ struct cache_entry *ce, struct stat *st)
+ int i, trust_ino = check_stat;
+#if defined(GIT_WINDOWS_NATIVE)
+ trust_ino = 0;
+ ce->ce_flags |= CE_MATCHED;
+ for (i = 0; i < state->istate->cache_nr; i++) {
+ struct cache_entry *dup = state->istate->cache[i];
+ if (dup == ce)
+ break;
+ if (dup->ce_flags & (CE_MATCHED | CE_VALID | CE_SKIP_WORKTREE))
+ continue;
+ if ((trust_ino && dup->ce_stat_data.sd_ino == st->st_ino) ||
+ (!trust_ino && !fspathcmp(ce->name, dup->name))) {
+ dup->ce_flags |= CE_MATCHED;
+ break;
+ }
+ }
* Write the contents from ce out to the working tree.
@@ -455,6 +483,9 @@ int checkout_entry(struct cache_entry *ce,
return -1;
+ if (state->clone)
+ mark_colliding_entries(state, ce, &st);
* We unlink the old file, to get the new one with the
* right permissions (including umask, which is nasty