git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Erik Faye-Lund <kusmabite@gmail.com>
To: smaxein@googlemail.com
Cc: Johannes Sixt <j6t@kdbg.org>, git@vger.kernel.org
Subject: Re: git filter-branch can "forget" directories on case insensitive filesystems
Date: Wed, 26 Jan 2011 01:58:09 +0100	[thread overview]
Message-ID: <AANLkTikO+dSwRS-x0UUB35iSFK3iE9cMZ6ae6go=MHHY@mail.gmail.com> (raw)
In-Reply-To: <4D3F69D2.800@googlemail.com>

On Wed, Jan 26, 2011 at 1:24 AM, Simeon Maxein <smaxein@googlemail.com> wrote:
> Am 26.01.2011 00:31, schrieb Erik Faye-Lund:
>> On Wed, Jan 26, 2011 at 12:26 AM, Simeon Maxein <smaxein@googlemail.com> wrote:
>>> Am 25.01.2011 22:56, schrieb Johannes Sixt:
>>>> On Dienstag, 25. Januar 2011, Simeon Maxein wrote:
>>>>> In my opinion this is a quite serious issue, because files are lost
>>>>> without any indication to the user. As of git 1.7.3.1 (tested on
>>>>> Windows/NTFS with msysGit this time), the problem still exists. Please
>>>>> give it a look. Fullquote of the problem description / steps to
>>>>> reproduce follows.
>>>>>> mkdir testdir
>>>>>> echo 'abc' >testdir/testfile
>>>>>> git add testdir
>>>>>> git commit -m foo
>>>>>> git rm -r testdir
>>>>>> mkdir testDir
>>>>>> echo 'abc' >testDir/testfile
>>>>>> git add testDir
>>>>>> git commit -m bar
>>>> Please retry with current release condidate of 1.7.4; it has some
>>>> core.ignorecase improvements w.r.t. directories. It could well be that your
>>>> problem is fixed.
>>>>
>>>> -- Hannes
>>> Thanks for the suggestion. The directory doesn't vanish anymore with
>>> 1.7.4, so a big Thank You to the developers for improving this. When
>>> rewriting the second commit ls still prints testdir as lowercase though.
>>> More of a nitpick, but it would still be neat to have it right.
>>>
>> This part is correct behavior  - git's internal representation is case
>> sensitive. So git's record of the file is still 'testdir', even i
>> you've deleted it and created a new called 'testDir'.
> A normal checkout for those commits results in "testdir" for the first
> one and "testDir" for the second one, so git does store the name
> difference. I would intuitively expect the trees prepared during
> filter-branch to be consistent with the result of a checkout.
>

I'm sorry, I misread what you wrote (I read the 'git rm testDir' as
'rm testDir').

The reason the old folder name is output appears to be that "git
checkout-index -f -u -a" (called from git-filter-branch) doesn't
change the directory name when the directory is already there. But to
be honest, I'm not really sure if it should or not. I'm too tired to
think it through right now ;)

      reply	other threads:[~2011-01-26  0:58 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-03 16:36 git filter-branch can "forget" directories on case insensitive filesystems Simeon Maxein
2011-01-25 20:56 ` Simeon Maxein
2011-01-25 21:56   ` Johannes Sixt
2011-01-25 23:26     ` Simeon Maxein
2011-01-25 23:31       ` Erik Faye-Lund
2011-01-26  0:24         ` Simeon Maxein
2011-01-26  0:58           ` Erik Faye-Lund [this message]

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='AANLkTikO+dSwRS-x0UUB35iSFK3iE9cMZ6ae6go=MHHY@mail.gmail.com' \
    --to=kusmabite@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=j6t@kdbg.org \
    --cc=smaxein@googlemail.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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).