From e18054ea937cf64f811eb3fba34e7d49a2b6d703 Mon Sep 17 00:00:00 2001 From: Alan Da Costa Date: Fri, 12 Sep 2025 12:29:18 -0700 Subject: [PATCH] lockfile: add case insensitive filesystem note Add note of case insensitive client filesystems may error due to a lock on a case variant ref to more quickly identify failure in fetch/pull. Signed-off-by: Alan Da Costa --- lockfile.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lockfile.c b/lockfile.c index 1d5ed016828746..99a470bd3df20f 100644 --- a/lockfile.c +++ b/lockfile.c @@ -156,7 +156,10 @@ void unable_to_lock_message(const char *path, int err, struct strbuf *buf) "an editor opened by 'git commit'. Please make sure all processes\n" "are terminated then try again. If it still fails, a git process\n" "may have crashed in this repository earlier:\n" - "remove the file manually to continue."), + "remove the file manually to continue.\n\n" + "On case insensitive client filesystems, multiple mixed-case refs will resolve\n" + "to the same lock file, possibly causing this error. If so, ensure your remote\n" + "refs have a single case variant."), absolute_path(path), strerror(err)); } else strbuf_addf(buf, _("Unable to create '%s.lock': %s"),