Re: [BUG?] "git rebase --interactive" forces me to edit message.

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jun 5, 2008, 04:40 UTC
Message-ID: <alpine.DEB.1.00.0806050539360.21190@racer>
In-Reply-To: <7v3ans5xit.fsf@gitster.siamese.dyndns.org>

Hi,

On Wed, 4 Jun 2008, Junio C Hamano wrote:

Show 19 quoted lines

> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> index 0ca986f..a6b6c9e 100755
> --- a/git-rebase--interactive.sh
> +++ b/git-rebase--interactive.sh
> @@ -390,11 +390,14 @@ do
>  				die "Cannot find the author identity"
>  			if test -f "$DOTEST"/amend
>  			then
> +				do_edit=-e
>  				git reset --soft HEAD^ ||
>  				die "Cannot rewind the HEAD"
> +			else
> +				do_edit=
>  			fi
>  			export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE &&
> -			git commit --no-verify -F "$DOTEST"/message -e ||
> +			git commit --no-verify -F "$DOTEST"/message $do_edit ||
>  			die "Could not commit staged changes."
>  		fi

I guess with the recent changes, I do not count as author of rebase -i anymore. Otherwise, I would say "NACK" for the reasons described in my other mail.

Ciao, Dscho