From: Eric Sunshine <sunshine@sunshineco.com>
Date: Wed, 19 Nov 2025 22:20:19 GMT
Subject: Re: [PATCH v7 3/3] fetch: fix failed batched updates skipping operations
Message-ID: <CAPig+cRjN85S3oCvazAvUD_V0EwkzdvKAm+DC66+uVijF5=HQA@mail.gmail.com>
In-Reply-To: <20251119-fix-tags-not-fetching-v7-3-0c8f9fb1f287@gmail.com>

On Wed, Nov 19, 2025 at 4:47 PM Karthik Nayak <karthik.188@gmail.com> wrote:
> Fix a regression introduced with batched updates in 0e358de64a (fetch:
> use batched reference updates, 2025-05-19) when fetching references. In
> the `do_fetch()` function, we jump to cleanup if committing the
> transaction fails, regardless of whether using batched or atomic
> updates. This skips three subsequent operations:
> [...]
> Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
> ---
> diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
> @@ -1639,6 +1639,93 @@ test_expect_success "backfill tags when providing a refspec" '
> +test_expect_success REFFILES "FETCH_HEAD is updated even if ref updates fail" '
> +       test_when_finished rm -rf base repo &&
> + [...]
> +       git init --bare repo &&
> +       (
> +               cd repo &&
> +               ! test -f FETCH_HEAD &&

Is this supposed to be asserting that the file does not exist or that
the path is not a file? If the former, then test_path_is_missing()
would be a better choice.

> +               git remote add origin ../base &&
> +               >refs/heads/foo.lock &&
> +               test_must_fail git fetch -f origin "refs/heads/*:refs/heads/*" 2>err &&
> +               test_grep "error: fetching ref refs/heads/foo failed: reference already exists" err &&
> +               test -f FETCH_HEAD
> +       )
> +'
> +
> +test_expect_success REFFILES "HEAD is updated even with conflicts" '
> +       test_when_finished rm -rf base repo &&
> + [...]
> +       git init --bare repo &&
> +       (
> +               cd repo &&
> +               git remote add origin ../base &&
> +
> +               ! test -f refs/remotes/origin/HEAD &&

Ditto.

> +               mkdir -p refs/remotes/origin &&
> +               >refs/remotes/origin/branch.lock &&
> +               test_must_fail git fetch origin &&
> +               test -f refs/remotes/origin/HEAD
> +       )
> +'