[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git
Subject:    Re: [PATCH 3/3] fetch: fix segfault in --negotiate-only without --negotiation-tip=*
From:       Jonathan Tan <jonathantanmy () google ! com>
Date:       2021-06-30 18:01:57
Message-ID: 20210630180157.1227166-1-jonathantanmy () google ! com
[Download RAW message or body]

> diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh
> index 66af411057c..920815478c7 100755
> --- a/t/t5702-protocol-v2.sh
> +++ b/t/t5702-protocol-v2.sh
> @@ -599,6 +599,23 @@ setup_negotiate_only () {
>  	test_commit -C client three
>  }
>  
> +test_expect_success 'usage: --negotiate-only without --negotiation-tip' '
> +	SERVER="server" &&
> +	URI="file://$(pwd)/server" &&
> +
> +	setup_negotiate_only "$SERVER" "$URI" &&
> +
> +	cat >err.expect <<-\EOF &&
> +	fatal: --negotiate-only needs one or more --negotiate-tip=*
> +	EOF
> +
> +	test_must_fail git -c protocol.version=2 -C client fetch \
> +		--negotiate-only \
> +		origin 2>err.actual &&
> +	cat err &&

I think I inadvertently left a similar line in other tests in this file, but
this shouldn't be in.

Other than that, all the patches look good to me. Thanks for taking a look at this.

I have a patch set [1] that fixes related bugs (but not this one - in
particular, --negotiate-only without --negotiation-tip still fails, so we still
need this patch set). I've tried merging my set into this set; the merge is
clean and all tests still pass, so there shouldn't be any problems with that.

[1] https://lore.kernel.org/git/cover.1624486920.git.jonathantanmy@google.com/
[prev in list] [next in list] [prev in thread] [next in thread]