diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-05-04 16:51:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-05-04 16:51:28 (GMT) |
| commit | 5048b20d1c2db7525e4739a75e2f89c1b96ad116 (patch) | |
| tree | 3abda20e70ce0ff944dd44ab4ce0084c45af6482 /builtin | |
| parent | 2cc712324d518b57ac895f22314ded09cc058621 (diff) | |
| parent | 91f8f7e46fd86f2d20e93e00af451bf75febfe18 (diff) | |
| download | git-5048b20d1c2db7525e4739a75e2f89c1b96ad116.zip git-5048b20d1c2db7525e4739a75e2f89c1b96ad116.tar.gz git-5048b20d1c2db7525e4739a75e2f89c1b96ad116.tar.bz2 | |
Merge branch 'rs/format-patch-pathspec-fix'
"git format-patch <args> -- <pathspec>" lost the pathspec when
showing the second and subsequent commits, which has been
corrected.
* rs/format-patch-pathspec-fix:
2.36 format-patch regression fix
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/log.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/builtin/log.c b/builtin/log.c index 6696c4c..3ac479b 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1896,6 +1896,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) rev.diff = 1; rev.max_parents = 1; rev.diffopt.flags.recursive = 1; + rev.diffopt.no_free = 1; rev.subject_prefix = fmt_patch_subject_prefix; memset(&s_r_opt, 0, sizeof(s_r_opt)); s_r_opt.def = "HEAD"; @@ -2021,13 +2022,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) if (use_stdout) { setup_pager(); - } else if (rev.diffopt.close_file) { - /* - * The diff code parsed --output; it has already opened the - * file, but we must instruct it not to close after each diff. - */ - rev.diffopt.no_free = 1; - } else { + } else if (!rev.diffopt.close_file) { int saved; if (!output_directory) |