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

Re: bug: interactive rebase's 'edit' insn copies notes to newly inserted commit

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 23, 2019, 16:41 UTC
Message-ID
<xmqqef1bn8av.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<20190823133850.GK20404@szeder.dev>
SZEDER Gábor <szeder.dev@gmail.com> writes:
> ...  However, once
> rebase stops for the 'edit' instruction the user can do just about
> anything, so I'm not sure how rebase could figure out when to copy the
> note and when not.
True.
> This doesn't happen when inserting a 'break' instruction between
> picking the "second" and "third" commits, and then adding new commits.

Meaning the original note for the second one is carried to the rewritten second, and the one for the third is carried to the rewritten third? That would be a reasonable outcome.

> Alas, the 'break' instruction is not even a year old, and I have been
> using 'edit' for this purpose for over a decade now...  so
> re-training my fingers will be hard :)

Probably a section in the tutorial and/or the example section of the "git rebase -i" documentation should encourage use of "break" when inserting a brand-new commit in the middle.

Thanks.
Previous: SZEDER Gábor
Message 2 of 2 in “bug: interactive rebase's 'edit' insn copies notes to newly inserted commit”
  1. SZEDER GáborAug 23, 2019
  2. Junio C HamanoAug 23, 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.