kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

format-patch: simplify get_notes_arg parameters 

85bd88a7 (revision: add rdiff_log_arg to rev_info, 2025-09-25) added
`rdiff_log_arg` to `struct rev_info`. `get_notes_arg` was changed to
take a second parameter, namely that member:

    get_notes_args(&(rev.rdiff_log_arg), &rev);

But this is obviously unnecessary; we can just use `&rev`.

Now is also a good time to format this `for_each...` line since it’s
gotten quite long.

Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
next
Kristoffer Haugsbakk 2026-10-04 19:58:34 +02:00 committed by Junio C Hamano
parent 593c42fe07
commit 4ddd9f289d
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/log.c
View File

@ -1333,16 +1333,18 @@ static int get_notes_refs(struct string_list_item *item, void *arg)
return 0;
}

static void get_notes_args(struct strvec *arg, struct rev_info *rev)
static void get_notes_args(struct rev_info *rev)
{
if (!rev->show_notes) {
strvec_push(arg, "--no-notes");
strvec_push(&rev->rdiff_log_arg, "--no-notes");
} else if (rev->notes_opt.use_default_notes > 0 ||
(rev->notes_opt.use_default_notes == -1 &&
!rev->notes_opt.extra_notes_refs.nr)) {
strvec_push(arg, "--notes");
strvec_push(&rev->rdiff_log_arg, "--notes");
} else {
for_each_string_list(&rev->notes_opt.extra_notes_refs, get_notes_refs, arg);
for_each_string_list(&rev->notes_opt.extra_notes_refs,
get_notes_refs,
&rev->rdiff_log_arg);
}
}

@ -2404,7 +2406,7 @@ int cmd_format_patch(int argc,
rev.rdiff_title = diff_title(&rdiff_title, reroll_count,
_("Range-diff:"),
_("Range-diff against v%d:"));
get_notes_args(&(rev.rdiff_log_arg), &rev);
get_notes_args(&rev);
}

/*