From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
git@vger.kernel.org, Stephan Beyer <s-beyer@gmx.net>,
Daniel Barkalow <barkalow@iabervon.org>
Subject: Re: [PATCH 2/2] rebase -i: use some kind of config file to save author information
Date: Tue, 23 Jun 2009 06:57:47 +0200 [thread overview]
Message-ID: <200906230657.48627.chriscool@tuxfamily.org> (raw)
In-Reply-To: <7v1vpdqiv2.fsf@alter.siamese.dyndns.org>
On Monday 22 June 2009, Junio C Hamano wrote:
>
> rebase -i: AUTHOR_{NAME,EMAIL,DATE} are already available in HEAD; use
> it.
>
> This only changes the codepath of "rebase -i --continue" that auto-amends
> the HEAD commit with the change user made but forgot to "commit --amend".
>
> git-rebase--interactive.sh | 3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> index f96d887..b8608be 100755
> --- a/git-rebase--interactive.sh
> +++ b/git-rebase--interactive.sh
> @@ -522,8 +522,7 @@ first and then run 'git rebase --continue' again."
> git reset --soft HEAD^ ||
> die "Cannot rewind the HEAD"
> fi
> - export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE &&
> - git commit --no-verify -F "$DOTEST"/message -e || {
> + git commit --no-verify -c HEAD || {
> test -n "$amend" && git reset --soft $amend
> die "Could not commit staged changes."
> }
This patch would use the message from HEAD instead of "$DOTEST"/message, but
it looks like we are changing "$DOTEST"/message sometimes with
the "make_squash_message" function.
Best regards,
Christian.
next prev parent reply other threads:[~2009-06-23 4:57 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-20 2:34 [PATCH 2/2] rebase -i: use some kind of config file to save author information Christian Couder
2009-06-20 9:27 ` Jakub Narebski
2009-06-21 5:15 ` Christian Couder
2009-06-21 21:55 ` Johannes Schindelin
2009-06-21 23:15 ` Junio C Hamano
2009-06-22 4:50 ` Christian Couder
2009-06-22 9:19 ` Johannes Schindelin
2009-06-23 5:30 ` Christian Couder
2009-06-23 9:40 ` Johannes Schindelin
2009-06-24 4:36 ` Christian Couder
2009-06-23 4:57 ` Christian Couder [this message]
2009-06-23 5:25 ` Junio C Hamano
2009-06-24 4:29 ` Christian Couder
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=200906230657.48627.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=s-beyer@gmx.net \
/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;
as well as URLs for NNTP newsgroup(s).