git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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.

Previous: Christian CouderNext: Junio C Hamano
Message 11 of 13 in “rebase -i: use some kind of config file to save author information”
  1. 2/2 rebase -i: use some kind of config file to save author informationChristian Couder, Jun 20, 2009
  2. Jakub NarebskiJun 20, 2009
  3. Christian CouderJun 21, 2009
  4. Johannes SchindelinJun 21, 2009
  5. Junio C HamanoJun 21, 2009
  6. Christian CouderJun 22, 2009
  7. Johannes SchindelinJun 22, 2009
  8. Christian CouderJun 23, 2009
  9. Johannes SchindelinJun 23, 2009
  10. Christian CouderJun 24, 2009
  11. Christian CouderJun 23, 2009
  12. Junio C HamanoJun 23, 2009
  13. Christian CouderJun 24, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.