On Tue, Sep 11, 2012 at 10:24 AM, Tomas Carnecky <tomas.carnecky@xxxxxxxxx> wrote: > On Tue, 11 Sep 2012 10:21:16 +0100, Roger Pau Monné <roger.pau@xxxxxxxxxxxxx> wrote: >> Hello, >> >> I'm using git for all my projects, and I usually work under Mac OS X >> with the default filesystem (that's case-insensitive, but >> case-preserving). I'm currently working on a project that has several >> branches, and two of them are called origin/DHCPCD and origin/dhcpcd >> respectively, that's unfortunate, but I cannot do anything about it. >> This completely breaks the git repository, because >> .git/refs/remotes/origin/DHCPD and .git/refs/remotes/origin/dhcpd are >> actually the same file, so when I try to update my repository >> performing a git pull I get the following error: >> >> error: Ref refs/remotes/origin/dhcpcd is at >> 6b371783de2def2d6e3ec2680ba731f7086067ee but expected >> 79f701ce599a27043eed8343f76406014963278a >> >> So I was wondering if anyone has stumbled upon this issue, and what's >> the best approach to fix it. > > Make a disk image and format it with a case sensitive filesystem (use the Disk > Utility to do that). Do your work there. Yes, I could also create a partition, or format my entire disk to case-sensitive (although I heard it might break some OS X applications), I guess adding a workaround for this in git itself is not appealing (like storing the branch file using a slightly different name?) -- To unsubscribe from this list: 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