fetch: fix non-conflicting tags not being committed

The commit 0e358de64a (fetch: use batched reference updates, 2025-05-19)
updated the 'git-fetch(1)' command to use batched updates. This batches
updates to gain performance improvements. When fetching references, each
update is added to the transaction. Finally, when committing, individual
updates are allowed to fail with reason, while the transaction itself
succeeds.

One scenario which was missed here, was fetching tags. When fetching
conflicting tags, the `fetch_and_consume_refs()` function returns '1',
which skipped committing the transaction and directly jumped to the
cleanup section. This mean that no updates were applied. This also
extends to backfilling tags which is done when fetching specific
refspecs which contains tags in their history.

Fix this by committing the transaction when we have an error code and
not using an atomic transaction. This ensures other references are
applied even when some updates fail.

The cleanup section is reached with `retcode` set in several scenarios:

   - `truncate_fetch_head()`, `open_fetch_head()` and `prune_refs()` set
     `retcode` before the transaction is created, so no commit is
     attempted.

   - `fetch_and_consume_refs()` and `backfill_tags()` are the primary
     cases this fix targets, both setting a positive `retcode` to
     trigger the committing of the transaction.

This simplifies error handling and ensures future modifications to
`do_fetch()` don't need special handling for batched updates.

Add tests to check for this regression. While here, add a missing
cleanup from previous test.

Reported-by: David Bohman <debohman@gmail.com>
Helped-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/fetch.c b/builtin/fetch.c
index f90179040ba34c6c906ed2c06a3d88a64202091b..b19fa8e966df052926cdc2042515d240cf6bb674 100644 (file)
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -1957,6 +1957,14 @@ static int do_fetch(struct transport *transport,
        }
 
 cleanup:
+       /*
+        * When using batched updates, we want to commit the non-rejected
+        * updates and also handle the rejections.
+        */
+       if (retcode && !atomic_fetch && transaction)
+               commit_ref_transaction(&transaction, false,
+                                      transport->remote->name, &err);
+
        if (retcode) {
                if (err.len) {
                        error("%s", err.buf);

diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index b7059cccaacce0d1f1a7abe8d3adc36499a92fb2..f500cb83cad99734f6b9505477ba79a10c163c57 100755 (executable)
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -1552,6 +1552,7 @@ test_expect_success CASE_INSENSITIVE_FS,REFFILES 'D/F conflict on case insensiti
 '
 
 test_expect_success REFFILES 'D/F conflict on case sensitive filesystem with lock' '
+       test_when_finished rm -rf base repo &&
        (
                git init --ref-format=reftable base &&
                cd base &&
@@ -1577,6 +1578,67 @@ test_expect_success REFFILES 'D/F conflict on case sensitive filesystem with loc
        )
 '
 
+test_expect_success 'fetch --tags fetches existing tags' '
+       test_when_finished rm -rf base repo &&
+
+       git init base &&
+       git -C base commit --allow-empty -m "empty-commit" &&
+
+       git clone --bare base repo &&
+
+       git -C base tag tag-1 &&
+       git -C repo for-each-ref >out &&
+       test_grep ! "tag-1" out &&
+       git -C repo fetch --tags &&
+       git -C repo for-each-ref >out &&
+       test_grep "tag-1" out
+'
+
+test_expect_success 'fetch --tags fetches non-conflicting tags' '
+       test_when_finished rm -rf base repo &&
+
+       git init base &&
+       git -C base commit --allow-empty -m "empty-commit" &&
+       git -C base tag tag-1 &&
+
+       git clone --bare base repo &&
+
+       git -C base tag tag-2 &&
+       git -C repo for-each-ref >out &&
+       test_grep ! "tag-2" out &&
+
+       git -C base commit --allow-empty -m "second empty-commit" &&
+       git -C base tag -f tag-1 &&
+
+       test_must_fail git -C repo fetch --tags 2>out &&
+       test_grep "tag-1  (would clobber existing tag)" out &&
+       git -C repo for-each-ref >out &&
+       test_grep "tag-2" out
+'
+
+test_expect_success "backfill tags when providing a refspec" '
+       test_when_finished rm -rf source target &&
+
+       git init source &&
+       git -C source commit --allow-empty --message common &&
+       git clone file://"$(pwd)"/source target &&
+       (
+           cd source &&
+           test_commit history &&
+           test_commit fetch-me
+       ) &&
+
+       # The "history" tag is backfilled even though we requested
+       # to only fetch HEAD
+       git -C target fetch origin HEAD:branch &&
+       git -C target tag -l >actual &&
+       cat >expect <<-\EOF &&
+       fetch-me
+       history
+       EOF
+       test_cmp expect actual
+'
+
 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd