From: Junio C Hamano <gitster@pobox•com>
To: Dave Borowitz <dborowitz@google•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCH 3/7] pack-protocol.txt: Mark all LFs in push-cert as required
Date: Wed, 01 Jul 2015 13:39:49 -0700 [thread overview]
Message-ID: <xmqq4mln8ve2.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <xmqq8uaz8vjb.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Wed, 01 Jul 2015 13:36:40 -0700")
Junio C Hamano <gitster@pobox•com> writes:
>> I am moderately negative about this; wouldn't it make the end result
>> cleaner to fix the implementation?
>
> I think that something like this should be sufficient. As the
> receiving end, we must not complain if there is no terminator.
> ...
And the change we are *not* going to make, but I made temporarily
only for testing, on the sending side to violate our "sender SHOULD
terminate with LF" rule would look like this:
There is a slight complication on sending an empty line without any
termination, though ;-) The reader that calls packet_read() cannot
tell such a payload from a flush packet, I think.
*That* may be something we want to document.
diff --git a/send-pack.c b/send-pack.c
index 2a64fec..1a743db 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -273,9 +273,11 @@ static int generate_push_cert(struct strbuf *req_buf,
packet_buf_write(req_buf, "push-cert%c%s", 0, cap_string);
for (cp = cert.buf; cp < cert.buf + cert.len; cp = np) {
+ int len;
np = next_line(cp, cert.buf + cert.len - cp);
+ len = (np <= cp + 1) ? 1 : (np - cp - 1);
packet_buf_write(req_buf,
- "%.*s", (int)(np - cp), cp);
+ "%.*s", len, cp);
}
packet_buf_write(req_buf, "push-cert-end\n");
next prev parent reply other threads:[~2015-07-01 20:39 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-01 18:08 [PATCH 0/7] Clarify signed push protocol documentation Dave Borowitz
2015-07-01 18:08 ` [PATCH 1/7] pack-protocol.txt: Add warning about protocol inaccuracies Dave Borowitz
2015-07-01 19:39 ` Jonathan Nieder
2015-07-01 19:52 ` Junio C Hamano
2015-07-01 19:56 ` Dave Borowitz
2015-07-01 18:08 ` [PATCH 2/7] pack-protocol.txt: Mark LF in command-list as optional Dave Borowitz
2015-07-01 18:21 ` Stefan Beller
2015-07-01 18:46 ` Dave Borowitz
2015-07-01 18:08 ` [PATCH 3/7] pack-protocol.txt: Mark all LFs in push-cert as required Dave Borowitz
2015-07-01 20:00 ` Junio C Hamano
2015-07-01 20:07 ` Dave Borowitz
2015-07-01 20:49 ` Junio C Hamano
2015-07-06 14:46 ` Dave Borowitz
2015-07-06 15:22 ` Dave Borowitz
2015-07-06 15:27 ` Dave Borowitz
2015-07-06 15:29 ` Dave Borowitz
2015-07-06 15:35 ` Dave Borowitz
2015-07-06 16:12 ` Junio C Hamano
2015-07-06 15:46 ` Shawn Pearce
2015-07-06 16:28 ` Junio C Hamano
2015-07-06 16:28 ` Junio C Hamano
2015-07-06 16:38 ` Dave Borowitz
2015-07-06 16:57 ` Junio C Hamano
2015-07-06 17:11 ` Dave Borowitz
2015-07-06 17:18 ` Dave Borowitz
2015-07-06 17:34 ` Junio C Hamano
2015-07-06 17:38 ` Dave Borowitz
2015-07-06 18:06 ` Junio C Hamano
2015-07-06 18:08 ` Dave Borowitz
2015-07-06 18:23 ` Junio C Hamano
2015-07-06 17:30 ` Junio C Hamano
2015-07-06 17:35 ` Dave Borowitz
2015-07-06 17:59 ` Junio C Hamano
2015-07-01 20:36 ` Junio C Hamano
2015-07-01 20:39 ` Junio C Hamano [this message]
2015-07-02 13:53 ` Jeff King
2015-07-03 17:45 ` Junio C Hamano
2015-07-03 18:07 ` Jeff King
2015-07-03 18:43 ` Shawn Pearce
2015-07-03 18:46 ` Jeff King
2015-07-01 18:08 ` [PATCH 4/7] pack-protocol.txt: Elaborate on pusher identity Dave Borowitz
2015-07-01 18:58 ` Junio C Hamano
2015-07-01 18:08 ` [PATCH 5/7] pack-protocol.txt: Be more precise about pusher-key relationship Dave Borowitz
2015-07-01 18:08 ` [PATCH 6/7] pack-protocol.txt: Mark pushee field as optional Dave Borowitz
2015-07-01 18:56 ` Junio C Hamano
2015-07-01 19:06 ` Dave Borowitz
2015-07-01 19:07 ` Junio C Hamano
2015-07-01 19:08 ` Junio C Hamano
2015-07-01 19:31 ` Dave Borowitz
2015-07-01 18:08 ` [PATCH 7/7] send-pack.c: Die if the nonce is empty Dave Borowitz
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=xmqq4mln8ve2.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=dborowitz@google$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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