git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Alex Henrie <alexhenrie24@gmail.com>
Cc: git@vger.kernel.org, tao@klerks.biz, newren@gmail.com,
	phillip.wood123@gmail.com, Johannes.Schindelin@gmx.de
Subject: Re: [PATCH v3 2/3] rebase: stop accepting --rebase-merges=""
Date: Wed, 22 Feb 2023 15:56:48 -0800	[thread overview]
Message-ID: <xmqqlekpb6f3.fsf@gitster.g> (raw)
In-Reply-To: <20230222051709.464275-2-alexhenrie24@gmail.com> (Alex Henrie's message of "Tue, 21 Feb 2023 22:17:08 -0700")

Alex Henrie <alexhenrie24@gmail.com> writes:

> diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh
> index e0d910c229..b8ba323dbc 100755
> --- a/t/t3430-rebase-merges.sh
> +++ b/t/t3430-rebase-merges.sh
> @@ -293,6 +293,12 @@ test_expect_success 'do not rebase cousins unless asked for' '
>  	EOF
>  '
>  
> +test_expect_success '--rebase-merges="" is invalid syntax' '
> +	echo "fatal: Unknown mode: " >expect &&
> +	! git rebase --rebase-merges="" HEAD^ 2>actual &&

"!" takes any non-zero exit, even a segfaulting "git".  Let's use
test_must_fail to make sure it dies in a controlled way, i.e.

	test_must_fail git rebase --rebase-merges="" HEAD^ 2>actual &&

> +	test_cmp expect actual
> +'
> +
>  test_expect_success 'refs/rewritten/* is worktree-local' '
>  	git worktree add wt &&
>  	cat >wt/script-from-scratch <<-\EOF &&

Other than that, looking good.

Thanks.

  reply	other threads:[~2023-02-22 23:56 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-22  5:17 [PATCH v3 1/3] rebase: add documentation and tests for --no-rebase-merges Alex Henrie
2023-02-22  5:17 ` [PATCH v3 2/3] rebase: stop accepting --rebase-merges="" Alex Henrie
2023-02-22 23:56   ` Junio C Hamano [this message]
2023-02-23  5:35     ` Alex Henrie
2023-02-22  5:17 ` [PATCH v3 3/3] rebase: add a config option for --rebase-merges Alex Henrie
2023-02-23  0:12   ` Junio C Hamano

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=xmqqlekpb6f3.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=alexhenrie24@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=newren@gmail.com \
    --cc=phillip.wood123@gmail.com \
    --cc=tao@klerks.biz \
    /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).