From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 20 Jun 2024 22:45:12 +0000 (-0700)
Subject: Merge branch 'rj/format-patch-auto-cover-with-interdiff'
X-Git-Tag: v2.46.0-rc0~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9071453ef69ca992e257db8cef4daac6a2d70e1c;p=thirdparty%2Fgit.git

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
---

9071453ef69ca992e257db8cef4daac6a2d70e1c
diff --cc builtin/log.c
index b8846a9458,d61cdbf304..21a81c72ac
--- a/builtin/log.c
+++ b/builtin/log.c
@@@ -2380,14 -2253,16 +2380,16 @@@ int cmd_format_patch(int argc, const ch
  		goto done;
  	total = nr;
  	if (cover_letter == -1) {
 -		if (config_cover_letter == COVER_AUTO)
 +		if (cfg.config_cover_letter == COVER_AUTO)
  			cover_letter = (total > 1);
+ 		else if ((idiff_prev.nr || rdiff_prev) && (total > 1))
 -			cover_letter = (config_cover_letter != COVER_OFF);
++			cover_letter = (cfg.config_cover_letter != COVER_OFF);
  		else
 -			cover_letter = (config_cover_letter == COVER_ON);
 +			cover_letter = (cfg.config_cover_letter == COVER_ON);
  	}
 -	if (!keep_subject && auto_number && (total > 1 || cover_letter))
 -		numbered = 1;
 -	if (numbered)
 +	if (!cfg.keep_subject && cfg.auto_number && (total > 1 || cover_letter))
 +		cfg.numbered = 1;
 +	if (cfg.numbered)
  		rev.total = total + start_number - 1;
  
  	if (idiff_prev.nr) {