Re: Bug report: OS X git-merge deletes recapitalized files when rename detection fails

2013-10-21 Thread Dan Fabulich
Eric, are you still investigating this bug? (I note that your reply, which cc:ed the list, doesn't seem to have been mailed out to the list, or added to mailing list archives.) On Oct 10, 2013, at 17:13 , Eric Boxer wrote: > I'm on it and I'll follow up shortly. > > > On Thu, Oct 10, 2013 at

Bug report: OS X git-merge deletes recapitalized files when rename detection fails

2013-10-10 Thread Dan Fabulich
On case-insensitive filesystems, git-merge deletes files that were recapitalized in another branch if rename detection fails. To repro: Run this script with git 1.8.4 on a case-insensitive filesystem. It repros for me on the default HFS filesystem on OS X 10.8, and also on Win7 NTFS. #!/bin/sh