From: "Torsten Bögershausen" <tboegi@web.de>
To: Jeff King <peff@peff.net>, roeder.git@mailnull.com
Cc: git@vger.kernel.org
Subject: Re: Git on macOS shows committed files as untracked
Date: Thu, 13 Jul 2017 10:42:29 +0200 [thread overview]
Message-ID: <130b338b-2e77-65d6-a3fa-f272ac43b81c@web.de> (raw)
In-Reply-To: <20170712231557.lu7ppj3bric2fahi@sigill.intra.peff.net>
On 13/07/17 01:15, Jeff King wrote:
> On Wed, Jul 12, 2017 at 06:21:28PM -0400, roeder.git@mailnull.com wrote:
>
>> In Git on macOS (git version 2.13.2 | brew install git) the status
>> command will show folders as untracked even though they are committed
>> and checked out from the repository. Does not reproduce on Windows and
>> Ubuntu.
>> [...]
>>
>> "d\314\207\316\271\314\223\314\200\342\225\223\316\265\357\256\257\360\222\221\217\342\227\213\342\225\223\320\243\314\213/"
>
> Probably the issue has to do with Unicode normalization, and you have
> files in your repository that can't be represented on your filesystem.
> For example, the first two code-points above are "d" followed by U+0307,
> "COMBINING DOT ABOVE". That pair can also be represented as U+1E0B,
> "LATIN SMALL LETTER D WITH DOT ABOVE".
>
> I don't recall which form HFS+ normalizes to, but basically what happens
> is that Git opens the file with some name, and the filesystem quietly
> rewrites that under the hood to a different, normalized name. Then when
> Git walks the directory later to ask which files are present, it sees
> this other filename that it has no clue about.
>
> Generally the solution is to commit the normalized name. There's some
> logic inside Git to "precompose" names to the right normalization, but I
> think that only affects new files you add. Existing committed files with
> the wrong normalization run into this issue.
>
> -Peff
>
Thanks for the fast analyzes -
in short:
what does
git -c core.precomposeunicode=true status
say ?
The easiest thing may be to set
git config --global core.precomposeunicode true
next prev parent reply other threads:[~2017-07-13 8:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-12 22:21 Git on macOS shows committed files as untracked roeder.git
2017-07-12 23:15 ` Jeff King
2017-07-13 8:42 ` Torsten Bögershausen [this message]
2017-07-13 19:35 ` Junio C Hamano
[not found] <CANmutwCSGgLxESPmTJZXkid6P1N6HwwOTaz=7QHOsSPrrHQ4EQ@mail.gmail.com>
2017-07-14 4:51 ` Lutz Roeder
2017-07-14 8:41 ` Torsten Bögershausen
2017-07-14 9:46 ` Elliot Chandler
[not found] ` <CAHVrscDg8bc-CYm6dSJFgdPSv1vJ0=AC0s3y26CHctKkYAvJyA@mail.gmail.com>
2017-07-14 12:35 ` Torsten Bögershausen
2017-07-14 13:28 ` Jeff King
2017-07-14 13:29 ` Andreas Schwab
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=130b338b-2e77-65d6-a3fa-f272ac43b81c@web.de \
--to=tboegi@web.de \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=roeder.git@mailnull.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).