Git development
 help / color / mirror / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Stefan Beller <sbeller@google.com>
Cc: gitster@pobox.com, git@vger.kernel.org,
	Matthieu.Moy@grenoble-inp.fr, j6t@kdbg.org,
	Lucien.Kong@ensimag.imag.fr
Subject: Re: [PATCH] rebase -x: do not die without -i
Date: Thu, 17 Mar 2016 07:48:43 +0100 (CET)	[thread overview]
Message-ID: <alpine.DEB.2.20.1603170745300.4690@virtualbox> (raw)
In-Reply-To: <1458177584-11378-1-git-send-email-sbeller@google.com>

Hi Stefan,

On Wed, 16 Mar 2016, Stefan Beller wrote:

> 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.

> -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

  parent reply	other threads:[~2016-03-17  6:49 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-17  1:19 [PATCH] rebase -x: do not die without -i Stefan Beller
2016-03-17  6:20 ` Johannes Sixt
2016-03-17  6:48 ` Johannes Schindelin [this message]
2016-03-17  7:50 ` Junio C Hamano
2016-03-17 13:11   ` Johannes Schindelin
2016-03-17 18:10     ` 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=alpine.DEB.2.20.1603170745300.4690@virtualbox \
    --to=johannes.schindelin@gmx.de \
    --cc=Lucien.Kong@ensimag.imag.fr \
    --cc=Matthieu.Moy@grenoble-inp.fr \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=j6t@kdbg.org \
    --cc=sbeller@google.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