Re: [PATCH] rebase -x: do not die without -i

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mar 17, 2016, 06:48 UTC
Message-ID: <alpine.DEB.2.20.1603170745300.4690@virtualbox>
In-Reply-To: <1458177584-11378-1-git-send-email-sbeller@google.com>

Hi Stefan,

On Wed, 16 Mar 2016, Stefan Beller wrote:

Show 12 quoted lines

> In the later steps of preparing a patch series I do not want to edit the
> patches any more, but just make sure the test suite passes after each
> patch. Currently I would run
> 
>   EDITOR=true git rebase -i <anchor> -x "make test"
> 
> In an ideal world the command would be simpler and just be
> 
>   git rebase <anchor> -x "make test"
> 
> to run the test for each commit I am about to send out for review.
> This patch enables the short line.

Makes sense.

> While at it, remove the double empty lines in t3404.

Could you split those out? They may interfere with some of my work, and it's easier to figure things out from a trivial patch than from one combining unrelated changes.

Show 8 quoted lines

> -test_expect_success 'rebase --exec without -i shows error message' '
> +test_expect_success 'rebase --exec works without -i ' '
>  	git reset --hard execute &&
> -	set_fake_editor &&
> -	test_must_fail git rebase --exec "git show HEAD" HEAD~2 2>actual &&
> -	echo "The --exec option must be used with the --interactive option" >expected &&
> -	test_i18ncmp expected actual
> +	git rebase --exec true HEAD~2 2>actual2 >actual1 &&

How about '--exec "touch executed"'? You'd want to verify that the command really was executed...

Ciao, Dscho