Git development
 help / color / mirror / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: しらいしななこ <nanako3@bluebottle.com>, git@vger.kernel.org
Subject: Re: [BUG?] "git rebase --interactive" forces me to edit message.
Date: Thu, 5 Jun 2008 05:40:48 +0100 (BST)	[thread overview]
Message-ID: <alpine.DEB.1.00.0806050539360.21190@racer> (raw)
In-Reply-To: <7v3ans5xit.fsf@gitster.siamese.dyndns.org>

Hi,

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

> 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

  reply	other threads:[~2008-06-05  4:43 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-05  3:58 [BUG?] "git rebase --interactive" forces me to edit message しらいしななこ
2008-06-05  4:14 ` Junio C Hamano
2008-06-05  4:40   ` Johannes Schindelin [this message]
2008-06-05  4:38 ` Johannes Schindelin
2008-06-06 21:46   ` しらいしななこ
2008-06-06 23:21     ` Junio C Hamano
     [not found] ` <200806062147.m56LlCOe030269@mi0.bluebottle.com>
2008-06-07  4:57   ` Johannes Schindelin
2008-06-07  6:53     ` 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.1.00.0806050539360.21190@racer \
    --to=johannes.schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=nanako3@bluebottle.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