Re: [PATCHv5] rebase [-i --exec | -ix] <CMD>...

From: konglu@minatec.inpg.fr
To: "Zbigniew Jędrzejewski-Szmek" <zbyszek@in.waw.pl>
Cc: Junio C Hamano <gitster@pobox.com>,
	Lucien Kong <Lucien.Kong@ensimag.imag.fr>,
	git@vger.kernel.org,
	Valentin Duperray <Valentin.Duperray@ensimag.imag.fr>,
	Franck Jonas <Franck.Jonas@ensimag.imag.fr>,
	Thomas Nguy <Thomas.Nguy@ensimag.imag.fr>,
	Huynh Khoi Nguyen Nguyen 
	<Huynh-Khoi-Nguyen.Nguyen@ensimag.imag.fr>,
	Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Subject: Re: [PATCHv5] rebase [-i --exec | -ix] <CMD>...
Date: Wed, 13 Jun 2012 20:05:52 +0200	[thread overview]
Message-ID: <20120613200552.Horde.JHFYfHwdC4BP2NaA39-wrmA@webmail.minatec.grenoble-inp.fr> (raw)
In-Reply-To: <4FD89DD6.1070705@in.waw.pl>

Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> a écrit :

> On 06/12/2012 04:46 PM, Junio C Hamano wrote:
>> I do not think it is worth another round of resend at this point, so
>> please eyeball the version I fixed up and queued in 'pu' when it is
>> pushed out.  I also moved the '-x <cmd>::' option description to
>> where it belongs (iow, not at the very beginning).
>
> Hi,
> I think some small changes are still in order. Please consider
> squashing this in:
>
> -----8<------
> Subject: [PATCH] squash! rebase -i: teach "--exec <cmd>"
>
> In the commit message: s/each runs/each run/
>
> Fixup to the documentation part:
> - Use the phrase "after each commit in the final history" from Junio's
>   commit message to replace "each commit application". The latter is
>   awkward and not really true.

After reading again the sentence, I find that the new expression is  
more appropriate
when it comes to the "--autosquash" case (here, "in the final history"  
is clearer than
"application"). Thus, the new formulation seems good to me.

> - Reorder paragraphs and reword the one about --interactive.
>   Make the part about two forms of exec less verbose.

Less verbose and avoid some repetitions. But...

> +You may execute several commands by either using one instance of `--exec`
> +with several commands:
>  +
> -You can also insert several instances of `--exec`, if you wish to only
> -have one command per line. For example:
> +	git rebase -i --exec "cmd1 && cmd2 && ..."
>  +
> -	git rebase -i --exec "cmd1" --exec "cmd2" ...
> +or equivalently by giving more than one `--exec`:

...I'm against using "equivalently" as in the first case, all the commands
are on one line, and in the second case, each commands have its line, thus
easier for the user to manipulate them independently.

> - Replace ';' with '&&' in the example. This (a) makes the two
>   examples equivalent, and (b) encourages good practice that we try
>   to follow in git tests to never fail silently. People are likely
>   to copy the example verbatim.

Why not.