From: "Roger Pau Monné" <roger.pau@entel.upc.edu>
To: Tomas Carnecky <tomas.carnecky@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Git an case-insensitive Mac OS X filesystem
Date: Tue, 11 Sep 2012 10:30:28 +0100 [thread overview]
Message-ID: <CAPLaKK4Xm8KzQ8HcM_TbbuDr1hcLjhjSOWSyJS3jFX0toFBjsA@mail.gmail.com> (raw)
In-Reply-To: <1347355466-ner-6656@calvin>
On Tue, Sep 11, 2012 at 10:24 AM, Tomas Carnecky
<tomas.carnecky@gmail.com> wrote:
> On Tue, 11 Sep 2012 10:21:16 +0100, Roger Pau Monné <roger.pau@entel.upc.edu> 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?)
next prev parent reply other threads:[~2012-09-11 9:30 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-11 9:21 Git an case-insensitive Mac OS X filesystem Roger Pau Monné
[not found] ` <1347355466-ner-6656@calvin>
2012-09-11 9:30 ` Roger Pau Monné [this message]
2012-09-11 9:36 ` Tomas Carnecky
2012-09-11 9:44 ` Roger Pau Monné
2012-09-11 15:44 ` Junio C Hamano
2012-09-11 10:06 ` Erik Faye-Lund
2012-09-11 10:28 ` Matthieu Moy
2012-09-11 11:18 ` Erik Faye-Lund
2012-09-11 11:25 ` Matthieu Moy
2012-09-11 15:40 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAPLaKK4Xm8KzQ8HcM_TbbuDr1hcLjhjSOWSyJS3jFX0toFBjsA@mail.gmail.com \
--to=roger.pau@entel.upc.edu \
--cc=git@vger.kernel.org \
--cc=tomas.carnecky@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).