mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rj/format-patch-auto-cover-with-interdiff'

Browse Source 
"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
This commit is contained in:
Junio C Hamano
2024-06-20 15:45:12 -07:00
parent 5f14d20984 f96c385449
commit 9071453ef6
3 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/log.c
View File

@ -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);
}