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

Re: [PATCH] rebase: ignore non-branch update-refs

From
PWPhillip Wood <phillip.wood123@gmail.com>
Date
May 10, 2026, 13:37 UTC
Message-ID
<0911df2d-aaa2-456e-a678-345239cefc67@gmail.com>
In-Reply-To
<xmqqqznk9ih8.fsf@gitster.g>
On 10/05/2026 02:11, Junio C Hamano wrote:
Show 21 quoted lines
> mail@abhinavg.net writes:
> 
>> diff --git a/sequencer.c b/sequencer.c
>> index b7d8dca47f..25bcfc5da0 100644
>> --- a/sequencer.c
>> +++ b/sequencer.c
>> @@ -6428,6 +6428,16 @@ static int add_decorations_to_list(const struct commit *commit,
>>   		const char *path;
>>   		size_t base_offset = ctx->buf->len;
>>   
>> +		/*
>> +		 * The global decoration table may contain names loaded by
>> +		 * a previous pretty format such as "%d".
>> +		 * This will result in refs such as "HEAD" being present.
>> +		 */
> 
> 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.

Looking at make_script_with_merges() it also calls load_branch_decorations() so we should probably add something like the diff below. Having said that this patch is a strict improvement so we can always fix make_script_with_merges() as a follow up.

Thanks
Phillip
---- 8< ----
diff --git b/sequencer.c b/sequencer.c
--- a/sequencer.c
+++ b/sequencer.c
@@ -5982,6 +5982,15 @@ static int make_script_with_merges(struct 
pretty_print_context *pp,
  			const char *label = label_from_message.buf;
  			const struct name_decoration *decoration =
  				get_name_decoration(&to_merge->item->object);
+
+			/*
+			 * If rebase.instructionFormat includes "%d"
+			 * then we to skip non-local decorations as
+			 * we're only interested in branch names
+			 */
+			while (decoration &&
+			       decoration->type != DECORATION_REF_LOCAL)
+				decoration = decoration->next;

  			if (decoration)
  				skip_prefix(decoration->name, "refs/heads/",
Previous: Junio C HamanoNext: Junio C Hamano
Message 8 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.