On Tue, 23 May 2006, Junio C Hamano wrote: > That's interesting. I wonder how... Does this sequence remove FOO > on that filesystem? > > $ date >FOO > $ rm -f foo > $ ls yes. $ ls $ date >FOO $ ls FOO $ rm -f foo $ ls > Also if you do the final "git pull" using resolve strategy, does > it change the result (say "git pull -s resolve . side" instead)? Different result: $ mkdir case-sensitivity-test $ cd case-sensitivity-test $ git init-db defaulting to local storage area $ echo foo > foo $ echo bar > bar $ git add foo bar $ git commit -m initial\ commit Committing initial tree 89ff1a2aefcbff0f09197f0fd8beeb19a7b6e51c $ git checkout -b side $ echo bar-side >> bar $ git commit -m side\ commit -o bar $ git checkout master $ rm foo $ git update-index --remove foo $ echo FOO > FOO $ git add FOO $ git commit -m case\ change $ ls FOO bar $ git pull -s resolve . side Trying really trivial in-index merge... fatal: Merge requires file-level merging Nope. Trying simple merge. Merge 06c11eeb08edefba8178b091287ec6d951d1ef1d, made by resolve. bar | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) $ ls FOO bar $ -- - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html