From: Andreas Ericsson <ae@op5.se>
To: Alexander Gallego <gallego.alexx@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git branch case insensitivity (Possible bug)
Date: Wed, 09 Jan 2013 16:52:59 +0100 [thread overview]
Message-ID: <50ED925B.2060402@op5.se> (raw)
In-Reply-To: <CAL+iW28LdnNiho4KksLX_S_-+bKX+77GPJ0zqQfkz4JpBJRskw@mail.gmail.com>
On 01/09/2013 04:46 PM, Alexander Gallego wrote:
> Hello,
>
> Here is a pastebin where I've reproduced the steps on a clean git repo.
>
> http://pastebin.com/0vQZEat0
>
>
>
> Brief description of the problem:
>
>
>
> 1.Basically one creates a local branch call it 'imp_fix' (branch off
> master --> this doesn't matter)
> 2.One does work, commit, etc
> 3.One rebases imp_fix with master via: (inside imp_fix) git rebase master
> 4.One checks out master via: git checkout master
> 5.One merges an incorrect name "imp_Fix" (notice the capital F)
> 6.The expected output is that git would say, silly you --> that branch
> does not exist.
> 7. Instead it merges (what I think is incorrectly) imp_fix.
>
>
> Kindly let me know if I can provide more details.
>
Are you using Mac OSX?
Are you using the HFS+ filesystem shipped with it?
Did you use the filesystem's default settings rather than reinstall your
system with sensible settings?
If you said "yes" to all of the above, this is a filesystem "feature",
courtesy of (cr)Apple, and you're screwed.
You can work around it by running "git pack-refs" every time you create
a branch or a tag though.
--
Andreas Ericsson andreas.ericsson@op5.se
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
Considering the successes of the wars on alcohol, poverty, drugs and
terror, I think we should give some serious thought to declaring war
on peace.
next prev parent reply other threads:[~2013-01-09 15:53 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-09 15:46 git branch case insensitivity (Possible bug) Alexander Gallego
2013-01-09 15:52 ` Andreas Ericsson [this message]
2013-01-09 17:03 ` Alexander Gallego
2013-01-09 18:34 ` Johannes Sixt
2013-01-09 17:47 ` Joshua Jensen
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=50ED925B.2060402@op5.se \
--to=ae@op5.se \
--cc=gallego.alexx@gmail.com \
--cc=git@vger.kernel.org \
/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).