diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-06-20 15:45:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-06-20 15:45:12 -0700 |
| commit | 9071453ef69ca992e257db8cef4daac6a2d70e1c (patch) | |
| tree | 0651daaa3d379ef3cc5bdc59082fd40093920363 /builtin/log.c | |
| parent | Merge branch 'kn/update-ref-symref' (diff) | |
| parent | format-patch: assume --cover-letter for diff in multi-patch series (diff) | |
| download | git-9071453ef69ca992e257db8cef4daac6a2d70e1c.tar.gz git-9071453ef69ca992e257db8cef4daac6a2d70e1c.zip | |
Merge branch 'rj/format-patch-auto-cover-with-interdiff'
"git format-patch --interdiff" for multi-patch series learned to
turn on cover letters automatically (unless told never to enable
cover letter with "--no-cover-letter" and such).
* rj/format-patch-auto-cover-with-interdiff:
format-patch: assume --cover-letter for diff in multi-patch series
t4014: cleanups in a few tests
Diffstat (limited to 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/log.c b/builtin/log.c index b8846a9458..21a81c72ac 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -2382,6 +2382,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) if (cover_letter == -1) { if (cfg.config_cover_letter == COVER_AUTO) cover_letter = (total > 1); + else if ((idiff_prev.nr || rdiff_prev) && (total > 1)) + cover_letter = (cfg.config_cover_letter != COVER_OFF); else cover_letter = (cfg.config_cover_letter == COVER_ON); } |