Re: [PATCH 2/2] rebase -i: use some kind of config file to save author information
- From
Christian Couder <chriscool@tuxfamily.org>
- Date
- Jun 23, 2009, 04:57 UTC
- Message-ID
- <200906230657.48627.chriscool@tuxfamily.org>
- In-Reply-To
- <7v1vpdqiv2.fsf@alter.siamese.dyndns.org>
On Monday 22 June 2009, Junio C Hamano wrote:
Show 24 quoted lines
>
> 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.