git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Does changing filename case breaks git's rename heuristic?

From
Michael J Gruber <git@drmicha.warpmail.net>
Date
Aug 27, 2010, 15:46 UTC
Message-ID
<4C77DDDC.8070407@drmicha.warpmail.net>
In-Reply-To
<AANLkTikN_PbNNH2f4zWuk1FH+LgpKzkoZ6mYOdT9ANBj@mail.gmail.com>
Dan Loewenherz venit, vidit, dixit 27.08.2010 16:52:
Show 75 quoted lines
> On Fri, Aug 27, 2010 at 1:00 AM, Michael J Gruber
> <git@drmicha.warpmail.net> wrote:
>> Dan Loewenherz venit, vidit, dixit 27.08.2010 06:57:
>>> Hi all,
>>>
>>> I may be mistaking a design decision as a bug, but I wanted to throw
>>> this out to the list to make sure. I think that re-enacting it will be
>>> the best way to explain it.
>>>
>>> $ mkdir test
>>> $ cd test
>>> $ git init
>>> $ cat > readme
>>> This is a test file.
>>> ^D
>>> $ git commit -am "first commit"
>>> [master (root-commit) fae0d05] first commit
>>>  1 files changed, 1 insertions(+), 0 deletions(-)
>>
>> ? You have not added any file, so git won't commit anything (not even
>> with -a). The above can't be a complete transcription. I assume you've
>> added readme with the content above.
> 
> Yep, that was my mistake. I left out 'git add readme'.
> 
>>
>>>
>>> For personal reasons, I now want readme to be uppercase.
>>>
>>> $ mv readme README
>>
>> Here's where using "git mv" would have been the easier choice, followed
>> by commit.
> 
> I agree. The instance where this actually occurred was that I had
> received an updated binary file to put into my repository. icon.png ->
> Icon.png. I suppose I could've run 'git mv' but I didn't realize what
> would happen if I didn't!
> 
>>
>>> $ cat > README
>>> This is the revised README.
>>
>> Renaming and changing the content completely in one step will always
>> trip up git's rename detection. You should rename, commit, change,
>> commit, unless the change affects a small portion of the file only.
> 
> Agreed.
> 
>>
>>> $ git status -sb
>>> ## master
>>>  M readme
>>
>> Again, this can't be a complete transcript. The above would lead to
>>
>>  D readme
>> ?? README
> 
> This is where I didn't botch up the transcript, and where I was
> actually surprised at what was going on. I'll insert a full one at the
> bottom of this email that can actually be run to get the same results.
> 
>>
>>> $ git add README
>>> $ git status -sb
>>> ## master
>>>  M readme
>>>
>>> At this point, I'm thinking that git is confused. Even though I've
>>
>> Are you possibly using a case-challenged file system? Is this maybe on a
>> Mac with HFS or Win with NTFS?
> 
> I'm using a Mac with a journaled filesystem and Git version 1.7.2.1.

The journalling is no problem, but HFS is. I'm no Macxpert but if I remember correctly, then under HFS "readme" and "README" are the same file, i.e. HFS only remembers how you want it spelled. People will correct me where I'm wrong.

Your test script should produce the expected result if you use, say, "readme" and "RAEDME" , i.e. names which differ by more than just case.

Cheers, Michael

> Transcript
[snipped]
Previous: Dan LoewenherzNext: Stephen Bash
Message 5 of 8 in “Does changing filename case breaks git's rename heuristic?”
  1. Dan LoewenherzAug 27, 2010
  2. Ramkumar RamachandraAug 27, 2010
  3. Michael J GruberAug 27, 2010
  4. Dan LoewenherzAug 27, 2010
  5. Michael J GruberAug 27, 2010
  6. Stephen BashAug 27, 2010
  7. Jay SoffianAug 27, 2010
  8. Ævar Arnfjörð BjarmasonAug 28, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.