Re: [PATCH] merge-recursive.c: Fix case-changing merge bug

2014-05-06 Thread Junio C Hamano
David Turner writes: > Would you prefer that I add it to t6022-merge-rename.sh? Or I could > add it to t7062-wtstatus-ignorecase.sh and rename that file to > t7062-ignorecase.sh. If I had only these two choices, t6022 would be it, as 6xxx series is where we have other tests for merge-recursiv

Re: [PATCH] merge-recursive.c: Fix case-changing merge bug

2014-05-06 Thread David Turner
On Tue, 2014-05-06 at 10:07 -0700, Junio C Hamano wrote: > David Turner writes: > > > 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 > > wit

Re: [PATCH] merge-recursive.c: Fix case-changing merge bug

2014-05-06 Thread Junio C Hamano
David Turner writes: > 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 > conside

[PATCH] merge-recursive.c: Fix case-changing merge bug

2014-05-01 Thread 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 name to be the same as