From: Junio C Hamano <gitster@pobox.com>
To: Christian Couder <christian.couder@gmail.com>
Cc: Patrick Steinhardt <ps@pks.im>, git <git@vger.kernel.org>
Subject: Re: [PATCH 1/2] fetch: allow passing a transaction to `s_update_ref()`
Date: Thu, 07 Jan 2021 23:18:35 -0800 [thread overview]
Message-ID: <xmqqsg7bj3qs.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <CAP8UFD1YxHGHLEHd_Bx1awSskjM6fHgM52nPWpTG2UHOmaOT9A@mail.gmail.com> (Christian Couder's message of "Fri, 8 Jan 2021 01:45:47 +0100")
Christian Couder <christian.couder@gmail.com> writes:
> Yeah, I think we also don't need the df_conflict variable, and I don't
> like the duplication of the following clean up code:
>
> ref_transaction_free(transaction_to_free);
> strbuf_release(&err);
> free(msg);
>
> Patrick's patch didn't introduce them, but we might still want to get
> rid of them (see below).
> diff --git a/builtin/fetch.c b/builtin/fetch.c
> index ecf8537605..8017fc19da 100644
> --- a/builtin/fetch.c
> +++ b/builtin/fetch.c
> @@ -581,6 +581,22 @@ static struct ref *get_ref_map(struct remote *remote,
> #define STORE_REF_ERROR_OTHER 1
> #define STORE_REF_ERROR_DF_CONFLICT 2
>
> +static int do_s_update_ref(struct ref_transaction *transaction,
> ...
> }
>
> static int refcol_width = 10;
> -------------------------------------------------------------------------
>
> After the above patch, Patrick's patch would become:
OK, I think the above as a preliminary clean-up would not hurt, but
the "if the caller gave us NULL as the transaction, we are
responsible for handling that bogosity" bit feels a bit too magical
to my taste. I do understand that your intention is that it
releaves the caller ...
> @@ -613,9 +615,16 @@ static int s_update_ref(const char *action,
> rla = default_rla.buf;
> msg = xstrfmt("%s: %s", rla, action);
>
> - transaction = ref_transaction_begin(&err);
> + /*
> + * If no transaction was passed to us, we manage the
> + * transaction ourselves. Otherwise, we trust the caller to
> + * handle the transaction lifecycle.
> + */
> + if (!transaction)
> + transaction = our_transaction = ref_transaction_begin(&err);
... here from having to deal with NULL from ref_transaction_begin(),
but I somehow do not see it as a code structure with a good taste.
I dunno.
Without that "if (!transaction ||" bit, I think your do_s_update_ref()
is a good clean-up, though.
Thanks.
> - ret = do_s_update_ref(transaction, ref, check_old, &err, msg);
> + ret = do_s_update_ref(transaction, ref, check_old, !!our_transaction,
> + &err, msg);
> if (ret) {
> error("%s", err.buf);
> ret = (ret == TRANSACTION_NAME_CONFLICT)
> @@ -623,7 +632,7 @@ static int s_update_ref(const char *action,
> : STORE_REF_ERROR_OTHER;
> }
>
> - ref_transaction_free(transaction);
> + ref_transaction_free(our_transaction);
> strbuf_release(&err);
> free(msg);
> return ret;
> ...
> -------------------------------------------------------------------------
>
> You can find these patches, with Patrick as the author, there:
>
> https://gitlab.com/gitlab-org/gitlab-git/-/commits/cc-improve-s-update-ref/
next prev parent reply other threads:[~2021-01-08 7:20 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-07 13:51 [PATCH 0/2] fetch: implement support for atomic reference updates Patrick Steinhardt
2021-01-07 13:51 ` [PATCH 1/2] fetch: allow passing a transaction to `s_update_ref()` Patrick Steinhardt
2021-01-07 22:59 ` Junio C Hamano
2021-01-08 0:45 ` Christian Couder
2021-01-08 7:18 ` Junio C Hamano [this message]
2021-01-07 13:51 ` [PATCH 2/2] fetch: implement support for atomic reference updates Patrick Steinhardt
2021-01-08 0:19 ` Junio C Hamano
2021-01-08 12:11 ` [PATCH v2 0/4] " Patrick Steinhardt
2021-01-08 12:11 ` [PATCH v2 1/4] fetch: extract writing to FETCH_HEAD Patrick Steinhardt
2021-01-08 23:40 ` Junio C Hamano
2021-01-11 10:26 ` Patrick Steinhardt
2021-01-11 19:24 ` Junio C Hamano
2021-01-08 12:11 ` [PATCH v2 2/4] fetch: refactor `s_update_ref` to use common exit path Patrick Steinhardt
2021-01-08 23:50 ` Junio C Hamano
2021-01-11 10:28 ` Patrick Steinhardt
2021-01-08 12:11 ` [PATCH v2 3/4] fetch: allow passing a transaction to `s_update_ref()` Patrick Steinhardt
2021-01-08 23:53 ` Junio C Hamano
2021-01-08 12:11 ` [PATCH v2 4/4] fetch: implement support for atomic reference updates Patrick Steinhardt
2021-01-09 0:05 ` Junio C Hamano
2021-01-11 10:42 ` Patrick Steinhardt
2021-01-11 19:47 ` Junio C Hamano
2021-01-12 12:22 ` Patrick Steinhardt
2021-01-12 12:29 ` Patrick Steinhardt
2021-01-12 19:19 ` Junio C Hamano
2021-01-11 11:05 ` [PATCH v3 0/5] " Patrick Steinhardt
2021-01-11 11:05 ` [PATCH v3 1/5] fetch: extract writing to FETCH_HEAD Patrick Steinhardt
2021-01-11 23:16 ` Junio C Hamano
2021-01-11 11:05 ` [PATCH v3 2/5] fetch: use strbuf to format FETCH_HEAD updates Patrick Steinhardt
2021-01-11 11:10 ` Patrick Steinhardt
2021-01-11 11:17 ` Christian Couder
2021-01-11 23:21 ` Junio C Hamano
2021-01-11 11:05 ` [PATCH v3 3/5] fetch: refactor `s_update_ref` to use common exit path Patrick Steinhardt
2021-01-11 11:05 ` [PATCH v3 4/5] fetch: allow passing a transaction to `s_update_ref()` Patrick Steinhardt
2021-01-11 11:05 ` [PATCH v3 5/5] fetch: implement support for atomic reference updates Patrick Steinhardt
2021-01-12 0:04 ` [PATCH v3 0/5] " Junio C Hamano
2021-01-12 12:27 ` [PATCH v4 " Patrick Steinhardt
2021-01-12 12:27 ` [PATCH v4 1/5] fetch: extract writing to FETCH_HEAD Patrick Steinhardt
2021-01-12 12:27 ` [PATCH v4 2/5] fetch: use strbuf to format FETCH_HEAD updates Patrick Steinhardt
2021-01-12 12:27 ` [PATCH v4 3/5] fetch: refactor `s_update_ref` to use common exit path Patrick Steinhardt
2021-01-12 12:27 ` [PATCH v4 4/5] fetch: allow passing a transaction to `s_update_ref()` Patrick Steinhardt
2021-01-12 12:27 ` [PATCH v4 5/5] fetch: implement support for atomic reference updates 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=xmqqsg7bj3qs.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--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).