From: Junio C Hamano <gitster@pobox.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Jonathan Tan <jonathantanmy@google.com>,
git@vger.kernel.org, spearce@spearce.org, sbeller@google.com,
peff@peff.net
Subject: Re: [PATCH v4 3/3] connect: advertized capability is not a ref
Date: Fri, 09 Sep 2016 13:40:27 -0700 [thread overview]
Message-ID: <xmqqtwdoajt0.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20160909194037.GG25016@google.com> (Jonathan Nieder's message of "Fri, 9 Sep 2016 12:40:37 -0700")
Jonathan Nieder <jrnieder@gmail.com> writes:
> Jonathan Tan wrote:
>
>> --- a/connect.c
>> +++ b/connect.c
>> @@ -172,8 +173,24 @@ struct ref **get_remote_heads(int in, char *src_buf, size_t src_len,
>> continue;
>> }
>>
>> + if (!strcmp(name, "capabilities^{}")) {
>> + if (saw_response)
>> + warning("protocol error: unexpected capabilities^{}, "
>> + "continuing anyway");
>
> Please use die() for these.
> ...
> The rest looks good.
Will squash this in, then.
connect.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/connect.c b/connect.c
index df25d21..5ccbd10 100644
--- a/connect.c
+++ b/connect.c
@@ -175,11 +175,9 @@ struct ref **get_remote_heads(int in, char *src_buf, size_t src_len,
if (!strcmp(name, "capabilities^{}")) {
if (saw_response)
- warning("protocol error: unexpected capabilities^{}, "
- "continuing anyway");
+ die("protocol error: unexpected capabilities^{}");
if (got_dummy_ref_with_capabilities_declaration)
- warning("protocol error: multiple capabilities^{}, "
- "continuing anyway");
+ die("protocol error: multiple capabilities^{}");
got_dummy_ref_with_capabilities_declaration = 1;
continue;
}
@@ -188,8 +186,7 @@ struct ref **get_remote_heads(int in, char *src_buf, size_t src_len,
continue;
if (got_dummy_ref_with_capabilities_declaration)
- warning("protocol error: unexpected ref after capabilities^{}, "
- "using this ref and continuing anyway");
+ die("protocol error: unexpected ref after capabilities^{}");
ref = alloc_ref(buffer + GIT_SHA1_HEXSZ + 1);
oidcpy(&ref->old_oid, &old_oid);
next prev parent reply other threads:[~2016-09-09 20:40 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-02 17:15 [PATCH 0/2] handle empty spec-compliant remote repos correctly Jonathan Tan
2016-09-02 17:15 ` [PATCH 1/2] tests: move test_lazy_prereq JGIT to test-lib.sh Jonathan Tan
2016-09-02 17:15 ` [PATCH 2/2] connect: know that zero-ID is not a ref Jonathan Tan
2016-09-02 19:37 ` Jonathan Nieder
2016-09-02 19:39 ` Shawn Pearce
2016-09-02 19:56 ` Stefan Beller
2016-09-02 20:00 ` Shawn Pearce
2016-09-02 20:13 ` Jeff King
2016-09-02 22:11 ` Jonathan Tan
2016-09-02 23:19 ` Jeff King
2016-09-03 2:03 ` Shawn Pearce
2016-09-03 2:17 ` Jeff King
2016-09-02 22:06 ` [PATCH v2 0/2] handle empty spec-compliant remote repos correctly Jonathan Tan
2016-09-02 22:06 ` [PATCH v2 1/2] tests: move test_lazy_prereq JGIT to test-lib.sh Jonathan Tan
2016-09-07 16:47 ` Junio C Hamano
2016-09-02 22:06 ` [PATCH v2 2/2] connect: advertized capability is not a ref Jonathan Tan
2016-09-02 22:40 ` Jonathan Nieder
2016-09-02 23:35 ` Jeff King
2016-09-02 23:48 ` Stefan Beller
2016-09-03 0:37 ` Jonathan Nieder
2016-09-02 23:51 ` Jonathan Nieder
2016-09-03 0:56 ` Jeff King
2016-09-07 17:02 ` Junio C Hamano
2016-09-07 17:10 ` Junio C Hamano
2016-09-07 20:38 ` Jonathan Nieder
2016-09-07 23:02 ` Junio C Hamano
2016-09-07 23:50 ` [PATCH v3 0/2] handle empty spec-compliant remote repos correctly Jonathan Tan
2016-09-07 23:50 ` [PATCH v3 1/2] tests: move test_lazy_prereq JGIT to test-lib.sh Jonathan Tan
2016-09-07 23:50 ` [PATCH v3 2/2] connect: advertized capability is not a ref Jonathan Tan
2016-09-08 1:34 ` Jonathan Nieder
2016-09-08 1:45 ` [PATCH] connect: tighten check for unexpected early hang up (Re: [PATCH v3 2/2] connect: advertized capability is not a ref) Jonathan Nieder
2016-09-08 1:46 ` Jonathan Nieder
2016-09-08 1:50 ` Jonathan Nieder
2016-09-08 16:42 ` Junio C Hamano
2016-09-08 16:28 ` Stefan Beller
2016-09-08 16:18 ` [PATCH v3 2/2] connect: advertized capability is not a ref Junio C Hamano
2016-09-09 17:36 ` [PATCH v4 0/3] handle empty spec-compliant remote repos correctly Jonathan Tan
2016-09-09 17:36 ` [PATCH v4 1/3] tests: move test_lazy_prereq JGIT to test-lib.sh Jonathan Tan
2016-09-10 5:51 ` Torsten Bögershausen
2016-09-10 6:00 ` Jeff King
2016-09-09 17:36 ` [PATCH v4 2/3] connect: tighten check for unexpected early hang up Jonathan Tan
2016-09-09 17:36 ` [PATCH v4 3/3] connect: advertized capability is not a ref Jonathan Tan
2016-09-09 19:40 ` Jonathan Nieder
2016-09-09 20:40 ` Junio C Hamano [this message]
2016-09-09 20:09 ` Junio C Hamano
2016-09-09 20:17 ` [PATCH v5 0/3] handle empty spec-compliant remote repos correctly Jonathan Tan
2016-09-09 21:07 ` Jonathan Nieder
2016-09-09 20:17 ` [PATCH v5 1/3] tests: move test_lazy_prereq JGIT to test-lib.sh Jonathan Tan
2016-09-09 20:17 ` [PATCH v5 2/3] connect: tighten check for unexpected early hang up Jonathan Tan
2016-09-09 20:17 ` [PATCH v5 3/3] connect: advertized capability is not a ref Jonathan Tan
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=xmqqtwdoajt0.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.com \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--cc=sbeller@google.com \
--cc=spearce@spearce.org \
/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).