format-patch: support --output option

We've never intended to support diff's --output option in format-patch.
And until baa4adc66a (parse-options: disable option abbreviation with
PARSE_OPT_KEEP_UNKNOWN, 2019-01-27), it was impossible to trigger. We
first parse the format-patch options before handing the remainder off to
setup_revisions(). Before that commit, we'd accept "--output=foo" as an
abbreviation for "--output-directory=foo". But afterwards, we don't
check abbreviations, and --output gets passed to the diff code.

This results in nonsense behavior and bugs. The diff code will have
opened a filehandle at rev.diffopt.file, but we'll overwrite that with
our own handles that we open for each individual patch file. So the
--output file will always just be empty. But worse, the diff code also
sets rev.diffopt.close_file, so log_tree_commit() will close the
filehandle itself. And then the main loop in cmd_format_patch() will try
to close it again, resulting in a double-free.

The simplest solution would be to just disallow --output with
format-patch, as nobody ever intended it to work. However, we have
accidentally documented it (because format-patch includes diff-options).
And it does work with "git log", which writes the whole output to the
specified file. It's easy enough to make that work for format-patch,
too: it's really the same as --stdout, but pointed at a specific file.

We can detect the use of the --output option by the "close_file" flag
(note that we can't use rev.diffopt.file, since the diff setup will
otherwise set it to stdout). So we just need to unset that flag, but
don't have to do anything else. Our situation is otherwise exactly like
--stdout (note that we don't fclose() the file, but nor does the stdout
case; exiting the program takes care of that for us).

Reported-by: Johannes Postler <johannes.postler@txture.io>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/log.c b/builtin/log.c
index dd85459d7435cdc2d97ad6d62ccceccdeae8921a..963821a5f51bec556fe675ae139a27e937d41eff 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -1942,11 +1942,18 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
        if (rev.show_notes)
                load_display_notes(&rev.notes_opt);
 
-       if (use_stdout + !!output_directory > 1)
-               die(_("--stdout and --output-directory are mutually exclusive"));
+       if (use_stdout + rev.diffopt.close_file + !!output_directory > 1)
+               die(_("--stdout, --output, and --output-directory are mutually exclusive"));
 
        if (use_stdout) {
                setup_pager();
+       } else if (rev.diffopt.close_file) {
+               /*
+                * The diff code parsed --output; it has already opened the
+                * file, but but we must instruct it not to close after each
+                * diff.
+                */
+               rev.diffopt.close_file = 0;
        } else {
                int saved;
 

diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index e8d6156a6ae7b2bfffc377ed939b08d87c24c354..42588bf6e11fd5ff0aee94e0cffeab3a62f963c8 100755 (executable)
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -1920,18 +1920,38 @@ test_expect_success 'format-patch -o overrides format.outputDirectory' '
 '
 
 test_expect_success 'format-patch forbids multiple outputs' '
-       rm -fr outdir &&
+       rm -fr outfile outdir &&
        test_must_fail \
-               git format-patch --stdout --output-directory=outdir
+               git format-patch --stdout --output-directory=outdir &&
+       test_must_fail \
+               git format-patch --stdout --output=outfile &&
+       test_must_fail \
+               git format-patch --output=outfile --output-directory=outdir
 '
 
 test_expect_success 'configured outdir does not conflict with output options' '
-       rm -fr outdir &&
+       rm -fr outfile outdir &&
        test_config format.outputDirectory outdir &&
        git format-patch --stdout &&
+       test_path_is_missing outdir &&
+       git format-patch --output=outfile &&
        test_path_is_missing outdir
 '
 
+test_expect_success 'format-patch --output' '
+       rm -fr outfile &&
+       git format-patch -3 --stdout HEAD >expect &&
+       git format-patch -3 --output=outfile HEAD &&
+       test_cmp expect outfile
+'
+
+test_expect_success 'format-patch --cover-letter --output' '
+       rm -fr outfile &&
+       git format-patch --cover-letter -3 --stdout HEAD >expect &&
+       git format-patch --cover-letter -3 --output=outfile HEAD &&
+       test_cmp expect outfile
+'
+
 test_expect_success 'format-patch --base' '
        git checkout patchid &&