From: Junio C Hamano <gitster@pobox.com>
To: Han Xin <chiyutianyi@gmail.com>
Cc: Git List <git@vger.kernel.org>,
Han Xin <hanxin.hx@alibaba-inc.com>,
Jiang Xin <zhiyou.jx@alibaba-inc.com>
Subject: Re: [PATCH 2/2] send-pack: check atomic push before running GPG
Date: Tue, 15 Sep 2020 14:40:03 -0700 [thread overview]
Message-ID: <xmqq5z8ezpl8.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <xmqqmu1qzrbo.fsf@gitster.c.googlers.com> (Junio C. Hamano's message of "Tue, 15 Sep 2020 14:02:35 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> I wonder if generate_push_cert() can be told about atomicity of the
> push, though. There is this loop in the function:
>
> int update_seen = 0;
>
> ...
> for (ref = remote_refs; ref; ref = ref->next) {
> if (check_to_send_update(ref, args) < 0)
> continue;
> update_seen = 1;
> strbuf_addf(&cert, "%s %s %s\n",
> oid_to_hex(&ref->old_oid),
> oid_to_hex(&ref->new_oid),
> ref->name);
> }
> if (!update_seen)
> goto free_return;
>
> that makes it a no-op without invoking GPG if no update is needed.
> Perhaps we can extend it to
>
> int failure_seen = 0;
> int update_seen = 0;
>
> ...
> for (ref = remote_refs; ref; ref = ref->next) {
> switch (check_to_send_update(ref, args)) {
> case CHECK_REF_STATUS_REJECTED:
> failure_seen = 1;
> break;
This "break" should be "continue" here. We want to exclude the ones
that we are not going to send to the other side from the push
certificate (in non-atomic case).
> case 0:
> update_seen = 1;
> break;
> case REF_STATUS_UPTODATE:
> break; /* OK */
> default:
> BUG("should not happen");
> }
> strbuf_addf(&cert, "%s %s %s\n",
> oid_to_hex(&ref->old_oid),
> oid_to_hex(&ref->new_oid),
> ref->name);
> }
> if (!update_seen || (use_atomic && failure_seen))
> goto free_return;
>
> to make it also a no-op when any local rejection under atomic mode?
>
> Thanks.
next prev parent reply other threads:[~2020-09-15 21:40 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-15 9:58 [PATCH 1/2] t5534: new test case for atomic signed push Han Xin
2020-09-15 9:58 ` [PATCH 2/2] send-pack: check atomic push before running GPG Han Xin
2020-09-15 21:02 ` Junio C Hamano
2020-09-15 21:40 ` Junio C Hamano [this message]
2020-09-16 1:53 ` Jiang Xin
2020-09-16 4:37 ` Junio C Hamano
2020-09-16 11:49 ` Jiang Xin
2020-09-16 23:44 ` Junio C Hamano
2020-09-18 4:50 ` [PATCH v2] send-pack: run GPG after atomic push checking Han Xin
2020-09-19 0:02 ` Junio C Hamano
2020-09-19 14:47 ` [PATCH v3] " Han Xin
2020-09-19 23:02 ` Junio C Hamano
2020-09-20 6:20 ` [PATCH v4] " Han Xin
2020-09-16 17:35 ` [PATCH 2/2] send-pack: check atomic push before running GPG 韩欣(炽天)
2020-09-15 20:31 ` [PATCH 1/2] t5534: new test case for atomic signed push Junio C Hamano
2020-09-16 0:34 ` brian m. carlson
2020-09-15 20:34 ` Junio C Hamano
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=xmqq5z8ezpl8.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=chiyutianyi@gmail.com \
--cc=git@vger.kernel.org \
--cc=hanxin.hx@alibaba-inc.com \
--cc=zhiyou.jx@alibaba-inc.com \
/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).