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

[PATCH v3 0/1] rebase: ignore non-branch update-refs

From
mail@abhinavg.net <mail@abhinavg.net>
Date
May 10, 2026, 22:41 UTC
Message-ID
<20260510224111.64467-1-mail@abhinavg.net>
In-Reply-To
<20260508015817.86177-1-mail@abhinavg.net>
From: Abhinav Gupta <mail@abhinavg.net>
Updated per suggestion to merge the conditionals.
Phillip wrote:
Show 10 quoted lines
> On 10/05/2026 02:11, Junio C Hamano wrote:
> > Your long topic branch may have local unannotated tags that point
> > into the middle of it, marking strategic points in the topic.
> >
> > With this change, the command no longer moves them when it rebases
> > the entire topic.  Isn't it a regression?
>
> sequencer.c:todo_list_add_update_ref_commands() calls
> load_branch_decorations() so it does not update tags and the patch is
> correct.

That's right, the documented contract is that only branches are updated. Without '%d' triggering a load_ref_decorations, load_branch_decorations would be called and only branch refs would be added to the rebase todo list.

Phillip wrote:
> Looking at make_script_with_merges() it also calls
> load_branch_decorations() so we should probably add something like the
> diff below.

Thinking out loud: Instead of caller-side filtering, another option might be to replace load_branch_decorations with a branch-specialized iterator that relies on load_ref_decorations and silently skips non-branch decorations. That's a more invasive change, though.

Thanks!
Abhinav Gupta (1):
  rebase: ignore non-branch update-refs
 sequencer.c                   |  8 +++++++-
 t/t3404-rebase-interactive.sh | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
base-commit: 94f057755b7941b321fd11fec1b2e3ca5313a4e0
-- 
2.54.0
Previous: Phillip WoodNext: mail@abhinavg.net
Message 5 of 14 in “rebase: ignore non-branch update-refs”
  1. rebase: ignore non-branch update-refsmail@abhinavg.net, May 6, 2026
  2. Phillip WoodMay 7, 2026
  3. rebase: ignore non-branch update-refsmail@abhinavg.net, May 8, 2026
  4. Phillip WoodMay 8, 2026
  5. 0/1 rebase: ignore non-branch update-refsmail@abhinavg.net, May 10, 2026
  6. 1/1 rebase: ignore non-branch update-refsmail@abhinavg.net, May 10, 2026
  7. Junio C HamanoMay 10, 2026
  8. Phillip WoodMay 10, 2026
  9. Junio C HamanoMay 10, 2026
  10. Abhinav GuptaMay 11, 2026
  11. Junio C HamanoMay 11, 2026
  12. Abhinav GuptaMay 11, 2026
  13. Phillip WoodMay 12, 2026
  14. Phillip WoodMay 15, 2026

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.