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

Re: minor interactive rebase regression: HEAD points to wrong commit while rewording

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 15, 2019, 16:36 UTC
Message-ID
<xmqqpnl64c94.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<026d6615-3420-eb31-8c93-a6245f3be503@gmail.com>
Phillip Wood <phillip.wood123@gmail.com> writes:
Show 12 quoted lines
> On 14/08/2019 22:20, SZEDER Gábor wrote:
>
> I changed the sequencer to always commit the cherry-pick and then run
> 'git commit --amend' for rewords [1]. Running
>
> 	time env GIT_EDITOR=true GIT_SEQUENCE_EDITOR='sed -i
> s/pick/reword/' ../bin-wrappers/git rebase -i --root
>
> over 100 commits I cannot see any real difference in the timings
> between master and that branch. Any difference is within the variation
> of the times of multiple runs. The change also fixes a bug when
> rewording a re-arranged root commit.

I guess that settles the "efficiency" story; besides, showing a wrong intermediate state to users and scripts efficiently is just as bad as showing a wrong state less efficiently.

Previous: Phillip WoodNext: Junio C Hamano
Message 9 of 10 in “minor interactive rebase regression: HEAD points to wrong commit while rewording”
  1. SZEDER GáborAug 12, 2019
  2. Junio C HamanoAug 12, 2019
  3. SZEDER GáborAug 12, 2019
  4. Phillip WoodAug 12, 2019
  5. Johannes SchindelinAug 14, 2019
  6. SZEDER GáborAug 14, 2019
  7. SZEDER GáborAug 14, 2019
  8. Phillip WoodAug 15, 2019
  9. Junio C HamanoAug 15, 2019
  10. Junio C HamanoAug 15, 2019

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.