git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"Jonathan Tan" <jonathantanmy@google.com>,
	"Derrick Stolee" <stolee@gmail.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v2 0/3] fetch: fix segfault, missing docs in --negotiate-only
Date: Thu,  8 Jul 2021 12:53:12 +0200	[thread overview]
Message-ID: <cover-0.3-00000000000-20210708T105034Z-avarab@gmail.com> (raw)
In-Reply-To: <cover-0.3-00000000000-20210630T163329Z-avarab@gmail.com>

Fix a segfault in recent code, per v1's:
https://lore.kernel.org/git/cover-0.3-00000000000-20210630T163329Z-avarab@gmail.com/

Fixes a stray "cat err" that snuck out of the lab and into the test,
spotted by Jonathan Tan.

Junio: You picked this up as ab/fetch-negotiate-segv-fix and it's
marked as "Will merge to 'next'", but it's not there yet. Hopefully
you'll see this before it's merged down. Sorry about the delay.

Ævar Arnfjörð Bjarmason (3):
  send-pack.c: move "no refs in common" abort earlier
  fetch: document the --negotiate-only option
  fetch: fix segfault in --negotiate-only without --negotiation-tip=*

 Documentation/config/fetch.txt  |  3 ++-
 Documentation/fetch-options.txt | 13 +++++++++++--
 builtin/fetch.c                 |  3 +++
 send-pack.c                     | 11 ++++++-----
 t/t5702-protocol-v2.sh          | 16 ++++++++++++++++
 5 files changed, 38 insertions(+), 8 deletions(-)

Range-diff against v1:
1:  1cd8b98d3d6 = 1:  10375a6484e send-pack.c: move "no refs in common" abort earlier
2:  7ff734ed70a = 2:  f86f4fc0e6f fetch: document the --negotiate-only option
3:  38930024d95 ! 3:  491d72c35a0 fetch: fix segfault in --negotiate-only without --negotiation-tip=*
    @@ t/t5702-protocol-v2.sh: setup_negotiate_only () {
     +	test_must_fail git -c protocol.version=2 -C client fetch \
     +		--negotiate-only \
     +		origin 2>err.actual &&
    -+	cat err &&
     +	test_cmp err.expect err.actual
     +'
     +
-- 
2.32.0.636.g43e71d69cff


  parent reply	other threads:[~2021-07-08 10:53 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-30 16:38 [PATCH 0/3] fetch: fix segfault, missing docs in --negotiate-only Ævar Arnfjörð Bjarmason
2021-06-30 16:38 ` [PATCH 1/3] send-pack.c: move "no refs in common" abort earlier Ævar Arnfjörð Bjarmason
2021-06-30 16:38 ` [PATCH 2/3] fetch: document the --negotiate-only option Ævar Arnfjörð Bjarmason
2021-06-30 16:38 ` [PATCH 3/3] fetch: fix segfault in --negotiate-only without --negotiation-tip=* Ævar Arnfjörð Bjarmason
2021-06-30 18:01   ` Jonathan Tan
2021-07-08 10:53 ` Ævar Arnfjörð Bjarmason [this message]
2021-07-08 10:53   ` [PATCH v2 1/3] send-pack.c: move "no refs in common" abort earlier Ævar Arnfjörð Bjarmason
2021-07-08 10:53   ` [PATCH v2 2/3] fetch: document the --negotiate-only option Ævar Arnfjörð Bjarmason
2021-07-08 10:53   ` [PATCH v2 3/3] fetch: fix segfault in --negotiate-only without --negotiation-tip=* Ævar Arnfjörð Bjarmason

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=cover-0.3-00000000000-20210708T105034Z-avarab@gmail.com \
    --to=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jonathantanmy@google.com \
    --cc=stolee@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).