Re: [PATCH v2] git-rebase-interactive: do not squash commits on abort

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sep 10, 2008, 09:53 UTC
Message-ID: <alpine.DEB.1.00.0809101150570.13830@pacific.mpi-cbg.de.mpi-cbg.de>
In-Reply-To: <20080909205036.GD28210@dpotapov.dyndns.org>

Hi,

On Wed, 10 Sep 2008, Dmitry Potapov wrote:

Show 18 quoted lines

> On Tue, Sep 09, 2008 at 04:17:36PM +0200, Johannes Schindelin wrote:
> >_
> > It might be safer to set the variable "amend" to empty before the "if".
> 
> OK. I have added it.
> 
>  git-rebase--interactive.sh |    8 ++++++--
>  1 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> index 929d681..aaca915 100755
> --- a/git-rebase--interactive.sh
> +++ b/git-rebase--interactive.sh
> @@ -427,14 +427,18 @@ do
>  		else
>  			. "$DOTEST"/author-script ||
>  				die "Cannot find the author identity"
> +			amend=""

Sorry, my mistake... I should have been more explicit. In most (if not all) shell scripts, we prefer to set to the empty string with the expression

			amend=

Sorry to be nitting here, but I think it might be desirable in the long run to have consistent code style, as it makes it a bigger pleasure to work with the code.

Ciao, Dscho