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

[PATCH 0/2] "rebase -x cmd" loses notes

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 12, 2021, 03:01 UTC
Message-ID
<20210312030107.1849942-1-gitster@pobox.com>
In-Reply-To
<xmqq8s6tcuxc.fsf@gitster.g>

So here is a semi-failed attempt to fix the issue I encountered earlier, cf. https://lore.kernel.org/git/xmqq8s6tcuxc.fsf@gitster.g/ where "git rebase" carries forward notes attached to the commits in the original history to their equivalents in the rewritten history, but "git rebase -x cmd" does not when cmd modifies the given HEAD commit.

Junio C Hamano (2):
  sequencer.c: make commit_post_rewrite() take two object names
  [WIP] sequencer.c: carry forward notes on HEAD across "rebase -x"
 builtin/commit.c              |  6 +++---
 sequencer.c                   | 19 +++++++++++++------
 sequencer.h                   |  2 +-
 t/t3404-rebase-interactive.sh | 18 ++++++++++++++++++
 4 files changed, 35 insertions(+), 10 deletions(-)
-- 
2.31.0-rc2-175-g3820f1c72e
Previous: Junio C HamanoNext: Junio C Hamano
Message 2 of 8 in “[BUG] cmd given to "rebase -x cmd" cannot see the original HEAD?”
  1. Junio C HamanoMar 11, 2021
  2. 0/2 "rebase -x cmd" loses notesJunio C Hamano, Mar 12, 2021
  3. 1/2 sequencer.c: make commit_post_rewrite() take two object namesJunio C Hamano, Mar 12, 2021
  4. 2/2 [WIP] sequencer.c: carry forward notes on HEAD across "rebase -x"Junio C Hamano, Mar 12, 2021
  5. Phillip WoodMar 12, 2021
  6. Ævar Arnfjörð BjarmasonMar 12, 2021
  7. Phillip WoodMar 12, 2021
  8. [WIP][PATCH] rebase: update the list of rewritten commits when amending pickPhillip Wood, Mar 12, 2021

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.