[PATCH 6/7] Make branch merging aware of underlying case-insensitive filsystems
- From
Linus Torvalds <torvalds@linux-foundation.org>
- Date
- Mar 22, 2008, 17:38 UTC
- Message-ID
- <alpine.LFD.1.00.0803221033430.3020@woody.linux-foundation.org>
- In-Reply-To
- <alpine.LFD.1.00.0803221030380.3020@woody.linux-foundation.org>
From: Linus Torvalds <torvalds@woody.linux-foundation.org> Date: Sat, 22 Mar 2008 09:35:59 -0700
If we find an unexpected file, see if that filename perhaps exists in a case-insensitive way in the index, and whether the file matches that. If so, ignore it as a known pre-existing file of a different name.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> ---
All right, this is *it*. This is the actual core code that does something interesting.
I've tried to explain the behaviour in the comment, and let's face it, the patch is really really simple (yeah, 26 new lines but they are all really trivial and over half of them of them are actually the comments about what is going on).
The core of the code itself is just two lines, really, but it's all wrapped in a helper function and I tried to make it be really really obvious what is going on!
The reason why "src_index" had to become non-const is stupid: it's not because we actually do anything that really writes to the index, but the lazy index name hashing code means that even just a name lookup will possibly create the name hash in the index.
Oh well.
unpack-trees.c | 26 ++++++++++++++++++++++++++ unpack-trees.h | 2 +- 2 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/unpack-trees.c b/unpack-trees.c index bf7d8f6..95d3413 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -521,6 +521,22 @@ static int verify_clean_subdirectory(struct cache_entry *ce, const char *action, } /* + * This gets called when there was no index entry for the tree entry 'dst', + * but we found a file in the working tree that 'lstat()' said was fine, + * and we're on a case-insensitive filesystem. + * + * See if we can find a case-insensitive match in the index that also + * matches the stat information, and assume it's that other file! + */ +static int icase_exists(struct unpack_trees_options *o, struct cache_entry *dst, struct stat *st) +{ + struct cache_entry *src; + + src = index_name_exists(o->src_index, dst->name, ce_namelen(dst), 1); + return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID); +} + +/* * We do not want to remove or overwrite a working tree file that * is not tracked, unless it is ignored. */ @@ -540,6 +556,16 @@ static int verify_absent(struct cache_entry *ce, const char *action, int dtype = ce_to_dtype(ce); struct cache_entry *result; + /* + * It may be that the 'lstat()' succeeded even though + * target 'ce' was absent, because there is an old + * entry that is different only in case.. + * + * Ignore that lstat() if it matches. + */ + if (ignore_case && icase_exists(o, ce, &st)) + return 0; + if (o->dir && excluded(o->dir, ce->name, &dtype)) /* * ce->name is explicitly excluded, so it is Ok to diff --git a/unpack-trees.h b/unpack-trees.h index ad8cc65..d436d6c 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -31,7 +31,7 @@ struct unpack_trees_options { void *unpack_data; struct index_state *dst_index; - const struct index_state *src_index; + struct index_state *src_index; struct index_state result; };
-- 1.5.5.rc0.28.g61a0.dirty