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

Re: Files 'Test.txt' and 'test.txt' are different in Git database, but are the same on Windows file system issue

From
VHViktor Hozhyi <viktor.hozhyi@gmail.com>
Date
Aug 12, 2020, 19:58 UTC
Message-ID
<CAAkwws_Y56QF8XnsBgG+HSF_mRpetJGh6TnTbjCgdwZ88kov=A@mail.gmail.com>
In-Reply-To
<27608194-0D85-4D71-8D88-C1278D8DA173@hxcore.ol>
On Wed, Aug 12, 2020 at 10:56 PM Viktor <viktor.hozhyi@gmail.com> wrote:
Show 36 quoted lines
>
> Hi,
>
>
>
> I’m not sure whether this behavior is on Windows only, so it’s up to you guys.
>
>
>
> Repro steps:
>
> 1.         Having branch (let say) develop with empty working tree and empty repository – create 2 more branches (‘foo’ and ‘bar’)
>
> 2.         Commit file ‘Test.txt’ with content ‘Test’ to ‘foo’ branch
>
> 3.         Switch to ‘bar’  branch and commit file ‘test.txt’ with content ‘test’ (pay attention lower-case)
>
> 4.         Merge ‘foo’ to develop
>
> 5.         Merge ‘bar’ to develop
>
> After it when you switch to develop – you always will have ‘local changes’. You can perform stash, hard reset, commit – you always will have local changes (and many following errors on other git operations due to local changes).
>
> Reason – we have different files in Git DB (‘Test.txt’ and ‘test.txt’), but when git restores them onto Windows file system – it just will rewrite 1 file with another, because for Windows file system – it is 2 equal names.
>
>
>
> Best regards,
>
> Viktor Hozhyi
>
> Skype: vitia444
>
> Phone (Telegram): +38 067 276 29 85
>
>
-- 
Best regards,
Viktor Hozhyi
Skype: vitia444
Phone (Telegram): +38 067 276 29 85
Next: brian m. carlson
Message 1 of 2 in “Re: Files 'Test.txt' and 'test.txt' are different in Git database, but are the same on Windows file system issue”
  1. Viktor HozhyiAug 12, 2020
  2. brian m. carlsonAug 12, 2020

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.