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

[Phillip Wood <phillip.wood123@gmail.com>]

On 10/05/2026 14:37, Phillip Wood wrote:
> 
> 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.

I've just had another look at this and even though we call 
load_branch_decorations() after calling setup_revisions_from_strvec() 
and prepare_revision_walk() we only load branch decorations. It turns 
out that "%d" calls load_ref_decorations() the first time it formats a 
commit and because we call load_branch_decorations() before the first 
call to get_revisions() we haven't formatted any commits yet. So we 
don't need to worry about rebase.instructionFormat changing the 
decorations that get loaded when generating the todo list with 
make_script_with_merges(). "rebase --update-refs" without "-r" only 
calls load_branch_decorations() after we've formatted a commit which is 
why it is affected.

Thanks

Phillip

> 
> 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/",
> 
>