From: Patrick Steinhardt <ps@pks.im>
To: Alan Da Costa via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Alan Da Costa <alandacosta@gmail.com>,
Karthik Nayak <karthik.188@gmail.com>
Subject: Re: [PATCH] lockfile: add case insensitive filesystem note
Date: Tue, 23 Sep 2025 09:56:13 +0200 [thread overview]
Message-ID: <aNJSnUGzzMlmrDQw@pks.im> (raw)
In-Reply-To: <pull.2053.git.git.1758578084468.gitgitgadget@gmail.com>
On Mon, Sep 22, 2025 at 09:54:44PM +0000, Alan Da Costa via GitGitGadget wrote:
> From: Alan Da Costa <alandacosta@gmail.com>
> When running git fetch or git pull on a case insensitive filesystem
> (e.g., default macOS), if multiple case variants of the same remote ref
> exist (often after a case-only rename), both variant locks map to the
> same on-disk path. When a local update is required, Git creates a lock
> for the first variant and then attempts to lock the second, which
> collides with the same lock file, so an “existing lock” error is
> reported. The underlying issue is mixed-case refs; resolve it by
> consolidating the remote to a single-case variant and update local refs
> accordingly.
Are you aware of Karthik's recent patch series at [1]? It looks like
this addresses your exact problem in a more direct way, and the
resulting error messages that we have in that patch series also give a
bit more advice for how to handle the situation.
The patch series wasn't merged yet, but will probably be merged soon.
Could you maybe test that series and say whether it addresses your need?
Thanks!
Patrick
[1]: https://lore.kernel.org/git/20250902-587-git-fetch-1-fails-fetches-on-case-insensitive-repositories-v1-0-35e69bbb507d@gmail.com/
next prev parent reply other threads:[~2025-09-23 7:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-22 21:54 [PATCH] lockfile: add case insensitive filesystem note Alan Da Costa via GitGitGadget
2025-09-22 22:19 ` Junio C Hamano
2025-09-23 7:56 ` Patrick Steinhardt [this message]
2025-09-23 9:03 ` Karthik Nayak
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=aNJSnUGzzMlmrDQw@pks.im \
--to=ps@pks.im \
--cc=alandacosta@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=karthik.188@gmail.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.
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).