From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Alex Riesen <raa.lkml@gmail.com>,
Pierre Habouzit <madcoder@debian.org>,
Daniel Barkalow <barkalow@iabervon.org>
Subject: Re: [PATCH 3/3] send-pack: assign remote errors to each ref
Date: Sat, 17 Nov 2007 21:39:43 -0500 [thread overview]
Message-ID: <20071118023942.GA4560@sigill.intra.peff.net> (raw)
In-Reply-To: <7vir40z7nm.fsf@gitster.siamese.dyndns.org>
On Sat, Nov 17, 2007 at 05:03:57PM -0800, Junio C Hamano wrote:
> > + for (ref = refs; ref; ref = ref->next) {
> > + const char *msg;
> > + if (prefixcmp(line, ref->name))
> > + continue;
>
> It probably would not matter for sane repositories, but with
> thousands of refs, strlen() and prefixcmp() may start to hurt:
It is actually _just_ prefixcmp. Or do you mean the strlen we call in
prefixcmp? If so, I think the right solution is to make prefixcmp
faster. :)
> but the "hint" optimization probably make the above
> micro-optimization irrelevant.
Agreed.
> It is preferred to have a multi-line comment like this:
>
> /*
> * A return value of -1 ...
> * ...
> * ... couldn't even get that far.
> */
OK. Since it is already in next, do you want a style fixup patch?
> Before receive_status() is called, can the refs already have the
> error status and string set?
Nothing else sets the string, so the latter is not possible (perhaps it
should be "remote_error" for clarity). It is less clear that we are not
overwriting another status; however, if you look at do_send_pack, we
only actually send the remote refs that are getting REF_STATUS_OK.
A broken or malicious remote could change the push status of an
arbitrary ref to rejection, but I don't really see the point. We could
explicitly check that we are changing from OK to REMOTE_REJECTED in
set_ref_error.
> > if (expect_status_report) {
> > - if (receive_status(in))
> > + ret = receive_status(in, remote_refs);
> > + if (ret == -2)
> > return -1;
>
> Hmm. When we did not receive status, we cannot tell what
> succeeded or failed, but what we _can_ tell the user is which
> refs we attempted to push. I wonder if robbing that information
> from the user with this "return -1" is a good idea. Perhaps we
> would instead want to set the status of all the refs to error
> and call print_push_status() anyway? I dunno.
That is a reasonable behavior (although they have already seen an
"error: " message, I think). We might also consider returning something
besides "-1" to differentiate "ok, but some refs failed" from "terribly
broken". The old code used to use "-2" and "-4", but I checked and all
of the error checking paths seemed to end up as a boolean.
I can work up a patch if there is consensus.
-Peff
next prev parent reply other threads:[~2007-11-18 2:40 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-17 12:53 [PATCH v3 0/3] tracking per-ref errors on push Jeff King
2007-11-17 12:54 ` [PATCH 1/3] send-pack: track errors for each ref Jeff King
2007-11-17 13:34 ` Alex Riesen
2007-11-17 18:05 ` Daniel Barkalow
2007-11-18 0:13 ` Jeff King
2007-11-18 1:21 ` Junio C Hamano
2007-11-18 3:12 ` Jeff King
2007-11-17 20:53 ` Junio C Hamano
2007-11-18 0:15 ` Jeff King
2007-11-17 12:55 ` [PATCH 2/3] send-pack: check ref->status before updating tracking refs Jeff King
2007-11-17 13:45 ` Alex Riesen
2007-11-17 13:53 ` Jeff King
2007-11-17 18:05 ` Daniel Barkalow
2007-11-17 12:56 ` [PATCH 3/3] send-pack: assign remote errors to each ref Jeff King
2007-11-17 18:05 ` Daniel Barkalow
2007-11-18 0:03 ` Jeff King
2007-11-18 1:03 ` Junio C Hamano
2007-11-18 2:39 ` Jeff King [this message]
2007-11-18 4:47 ` Junio C Hamano
2007-11-18 5:00 ` Jeff King
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071118023942.GA4560@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=madcoder@debian.org \
--cc=raa.lkml@gmail.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.
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 NNTP newsgroup(s).