Re: [PATCH 1/2] merge-recursive.c: Fix case-changing merge.

2014-05-08 Thread Junio C Hamano
Thanks; I think this is identical to what we already have on the dt/merge-recursive-case-insensitive topic. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH 1/2] merge-recursive.c: Fix case-changing merge.

2014-05-08 Thread dturner
From: David Turner On a case-insensitive filesystem, when merging, a file would be wrongly deleted from the working tree if an incoming commit had renamed it changing only its case. When merging a rename, the file with the old name would be deleted -- but since the filesystem considers the old n

Re: [PATCH 1/2] merge-recursive.c: Fix case-changing merge.

2014-05-07 Thread Junio C Hamano
Jonathan Nieder writes: >> Please make it a habit to use "test -f" when you expect "the path >> exists as a file", not merely "something exists there I do not care >> if it is a file or a directory", for which "test -e" is perfectly >> appropriate. > > Or, better in tests, > > test_path_is_

Re: [PATCH 1/2] merge-recursive.c: Fix case-changing merge.

2014-05-07 Thread Jonathan Nieder
Junio C Hamano wrote: > dtur...@twopensource.com writes: >> +test -e testcase > > Please make it a habit to use "test -f" when you expect "the path > exists as a file", not merely "something exists there I do not care > if it is a file or a directory", for which "test -e" is perfectly > approp

Re: [PATCH 1/2] merge-recursive.c: Fix case-changing merge.

2014-05-07 Thread Junio C Hamano
dtur...@twopensource.com writes: > +if ! test_have_prereq CASE_INSENSITIVE_FS > +then > + skip_all='skipping case insensitive tests - case sensitive file system' > + test_done > +fi > + > +test_expect_success 'merge with case-changing rename' ' > + test $(git config core.ignorecase) =

[PATCH 1/2] merge-recursive.c: Fix case-changing merge.

2014-05-06 Thread dturner
From: David Turner On a case-insensitive filesystem, when merging, a file would be wrongly deleted from the working tree if an incoming commit had renamed it changing only its case. When merging a rename, the file with the old name would be deleted -- but since the filesystem considers the old n