From: Junio C Hamano <gitster@pobox.com>
To: Patrick Steinhardt <ps@pks.im>
Cc: git@vger.kernel.org,
Christian Couder <christian.couder@gmail.com>,
Jonathan Tan <jonathantanmy@google.com>,
Elijah Newren <newren@gmail.com>
Subject: Re: [PATCH v2 4/7] fetch: report errors when backfilling tags fails
Date: Thu, 17 Feb 2022 14:16:32 -0800 [thread overview]
Message-ID: <xmqqo8356svz.fsf@gitster.g> (raw)
In-Reply-To: <bc1e396ae0ad380dffd7962cc223cc63e6facffe.1645102965.git.ps@pks.im> (Patrick Steinhardt's message of "Thu, 17 Feb 2022 14:04:28 +0100")
Patrick Steinhardt <ps@pks.im> writes:
> +static int backfill_tags(struct transport *transport,
> ...
> }
The change to this function is quite straight-forward.
> static int do_fetch(struct transport *transport,
> @@ -1632,8 +1634,16 @@ static int do_fetch(struct transport *transport,
> struct ref *tags_ref_map = NULL, **tail = &tags_ref_map;
>
> find_non_local_tags(remote_refs, &tags_ref_map, &tail);
> - if (tags_ref_map)
> - backfill_tags(transport, tags_ref_map, &fetch_head, worktrees);
> + if (tags_ref_map) {
> + /*
> + * If backfilling of tags fails then we want to tell
> + * the user so, but we have to continue regardless to
> + * populate upstream information of the references we
> + * have already fetched above.
> + */
OK. Unless atomic, using the available information on successfully
updated ones would be fine. Perhaps under --atomic mode, a failure
to commit the ref transaction will also prevent the upstream
information from getting updated? We'll see soon enough.
> + if (backfill_tags(transport, tags_ref_map, &fetch_head, worktrees))
> + retcode = 1;
> + }
> free_refs(tags_ref_map);
> }
> diff --git a/t/t5503-tagfollow.sh b/t/t5503-tagfollow.sh
> index 6ffe2a5719..c057c49e80 100755
> --- a/t/t5503-tagfollow.sh
> +++ b/t/t5503-tagfollow.sh
> @@ -233,9 +233,7 @@ test_expect_success 'backfill failure causes command to fail' '
> done
> EOF
>
> - # Even though we fail to create refs/tags/tag1 the below command
> - # unexpectedly succeeds.
> - git -C clone5 fetch .. $B:refs/heads/something &&
> + test_must_fail git -C clone5 fetch .. $B:refs/heads/something &&
OK.
> test $B = $(git -C clone5 rev-parse --verify refs/heads/something) &&
> test $S = $(git -C clone5 rev-parse --verify tag2) &&
> test_must_fail git -C clone5 rev-parse --verify tag1
next prev parent reply other threads:[~2022-02-17 22:17 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-17 13:04 [PATCH v2 0/7] fetch: improve atomicity of `--atomic` flag Patrick Steinhardt
2022-02-17 13:04 ` [PATCH v2 1/7] fetch: increase test coverage of fetches Patrick Steinhardt
2022-02-17 15:18 ` Christian Couder
2022-02-21 7:57 ` Patrick Steinhardt
2022-02-17 20:41 ` Junio C Hamano
2022-02-17 22:43 ` Junio C Hamano
2022-02-18 6:49 ` Patrick Steinhardt
2022-02-18 16:59 ` Junio C Hamano
2022-03-03 0:25 ` Junio C Hamano
2022-03-03 6:47 ` Patrick Steinhardt
2022-02-17 13:04 ` [PATCH v2 2/7] fetch: backfill tags before setting upstream Patrick Steinhardt
2022-02-17 22:07 ` Junio C Hamano
2022-02-17 13:04 ` [PATCH v2 3/7] fetch: control lifecycle of FETCH_HEAD in a single place Patrick Steinhardt
2022-02-17 22:12 ` Junio C Hamano
2022-02-17 13:04 ` [PATCH v2 4/7] fetch: report errors when backfilling tags fails Patrick Steinhardt
2022-02-17 22:16 ` Junio C Hamano [this message]
2022-02-17 13:04 ` [PATCH v2 5/7] refs: add interface to iterate over queued transactional updates Patrick Steinhardt
2022-02-17 13:04 ` [PATCH v2 6/7] fetch: make `--atomic` flag cover backfilling of tags Patrick Steinhardt
2022-02-17 22:27 ` Junio C Hamano
2022-02-17 13:04 ` [PATCH v2 7/7] fetch: make `--atomic` flag cover pruning of refs Patrick Steinhardt
2022-02-17 15:50 ` [PATCH v2 0/7] fetch: improve atomicity of `--atomic` flag Christian Couder
2022-02-17 22:30 ` Junio C Hamano
2022-02-21 8:02 ` [PATCH v3 " Patrick Steinhardt
2022-02-21 8:02 ` [PATCH v3 1/7] fetch: increase test coverage of fetches Patrick Steinhardt
2022-03-03 0:30 ` Junio C Hamano
2022-03-03 0:32 ` Junio C Hamano
2022-03-03 6:43 ` Patrick Steinhardt
2022-03-03 6:49 ` Junio C Hamano
2022-03-03 6:51 ` Patrick Steinhardt
2022-02-21 8:02 ` [PATCH v3 2/7] fetch: backfill tags before setting upstream Patrick Steinhardt
2022-02-21 8:02 ` [PATCH v3 3/7] fetch: control lifecycle of FETCH_HEAD in a single place Patrick Steinhardt
2022-02-21 8:02 ` [PATCH v3 4/7] fetch: report errors when backfilling tags fails Patrick Steinhardt
2022-02-21 8:02 ` [PATCH v3 5/7] refs: add interface to iterate over queued transactional updates Patrick Steinhardt
2022-02-21 8:02 ` [PATCH v3 6/7] fetch: make `--atomic` flag cover backfilling of tags Patrick Steinhardt
2022-02-21 8:02 ` [PATCH v3 7/7] fetch: make `--atomic` flag cover pruning of refs Patrick Steinhardt
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqo8356svz.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.com \
--cc=newren@gmail.com \
--cc=ps@pks.im \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).