revision: add rdiff_log_arg to rev_info

git-format-patch(1) supports Git notes by showing them beneath the
patch/commit message, similar to git-log(1). The command also supports
showing those same notes ref names in the range diff output.

Note *the same* ref names; any Git notes options or configuration
variables need to be handed off to the range-diff machinery. This works
correctly in the case when the range diff is on the cover letter. But it
does not work correctly when the output is a single patch with an
embedded range diff.

Concretely, git-format-patch(1) needs to pass `--[no-]notes` options
on to the range-diff subprocess in `range-diff.c`. This is handled in
`builtin/log.c` by the local variable `log_arg` in the case of mul-
tiple commits, but not in the single commit case where there is no
cover letter and the range diff is embedded in the patch output; the
range diff is then made in `log-tree.c`, whither `log_arg` has not
been propagated. This means that the range-diff subprocess reverts
to its default behavior, which is to act like git-log(1) w.r.t. notes.

We need to fix this. But first lay the groundwork by converting
`log_arg` to a struct member; next we can simply use that member
in `log-tree.c` without having to thread it from `builtin/log.c`.

No functional changes.

Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/log.c b/builtin/log.c
index 131512ac1af0f17d64ee54cdff0d2c8dac859aa2..9eff62ce1110fe5d12f4ecc5196a0e0767d23af8 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -1400,13 +1400,12 @@ static void make_cover_letter(struct rev_info *rev, int use_separate_file,
                 * can be added later if deemed desirable.
                 */
                struct diff_options opts;
-               struct strvec log_arg = STRVEC_INIT;
                struct range_diff_options range_diff_opts = {
                        .creation_factor = rev->creation_factor,
                        .dual_color = 1,
                        .max_memory = RANGE_DIFF_MAX_MEMORY_DEFAULT,
                        .diffopt = &opts,
-                       .log_arg = &log_arg
+                       .log_arg = &rev->rdiff_log_arg
                };
 
                repo_diff_setup(the_repository, &opts);
@@ -1414,9 +1413,7 @@ static void make_cover_letter(struct rev_info *rev, int use_separate_file,
                opts.use_color = rev->diffopt.use_color;
                diff_setup_done(&opts);
                fprintf_ln(rev->diffopt.file, "%s", rev->rdiff_title);
-               get_notes_args(&log_arg, rev);
                show_range_diff(rev->rdiff1, rev->rdiff2, &range_diff_opts);
-               strvec_clear(&log_arg);
        }
 }
 
@@ -2328,6 +2325,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);
        }
 
        /*
@@ -2487,6 +2485,7 @@ done:
        rev.diffopt.no_free = 0;
        release_revisions(&rev);
        format_config_release(&cfg);
+       strvec_clear(&rev.rdiff_log_arg);
        return 0;
 }
 

diff --git a/revision.h b/revision.h
index 21e288c5baa2b5c0f340f66fe6b31fff1b1d7d7d..ce30570d86a6140b169864d695c74a4ee6b8fc33 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -334,6 +334,7 @@ struct rev_info {
        /* range-diff */
        const char *rdiff1;
        const char *rdiff2;
+       struct strvec rdiff_log_arg;
        int creation_factor;
        const char *rdiff_title;
 
@@ -410,6 +411,7 @@ struct rev_info {
        .expand_tabs_in_log = -1, \
        .commit_format = CMIT_FMT_DEFAULT, \
        .expand_tabs_in_log_default = 8, \
+       .rdiff_log_arg = STRVEC_INIT, \
 }
 
 /**