Re: Re [bug] pull --prune could not delete references due to lock file already exists error

From: brian m. carlson <sandals@crustytoothpaste.net>
Date: Jun 30, 2025, 14:20 UTC
Message-ID: <aGKdICvmKlumU0ru@fruit.crustytoothpaste.net>
In-Reply-To: <CAOLa=ZSA273KGPnwZ2aRBU_ybcCTYogBHvUwpa+5CfDOc2bEWg@mail.gmail.com>

On 2025-06-30 at 13:46:35, Karthik Nayak wrote:

Show 27 quoted lines

> I can see few solutions overall (including the one you suggested).
> 
> One solution is to drop duplicates in case insensitive systems, this is
> the shortest and easiest fix for now.
> 
> Perhaps something like (untested back of the hand code):
> 
> diff --git a/builtin/fetch.c b/builtin/fetch.c
> index cc0a3deb61..bc79d74b82 100644
> --- a/builtin/fetch.c
> +++ b/builtin/fetch.c
> @@ -1352,10 +1352,16 @@ static int prune_refs(struct display_state
> *display_state,
>  					goto cleanup;
>  			}
>  		} else {
> +			const char *prev;
>  			struct string_list refnames = STRING_LIST_INIT_NODUP;
> 
> -			for (ref = stale_refs; ref; ref = ref->next)
> +			for (ref = stale_refs; ref; ref = ref->next) {
> +				if (ignore_case && prev && !strcasecmp(ref->next, prev))
> +					continue;
> +
>  				string_list_append(&refnames, ref->name);
> +				prev = ref->name;
> +			}

This won't work in the general case, since the two refs that match case insensitively aren't guaranteed to be adjacent. For instance:

    refs/heads/AAAA
    refs/heads/AAAB
    refs/heads/aaaa
    refs/heads/aaab

They'll be in the above order for a bytewise comparison, but the matching entries won't be adjacent in the list.

Another option is for users on case-insensitive systems to use reftable, which won't have the same problems as the file-based backend and will preserve case properly.

-- 
brian m. carlson (they/them)
Toronto, Ontario, CA