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

Merge branch 'jk/format-patch-number-singleton-patch-with-cover'

Browse Source 
"git format-patch --cover-letter HEAD^" to format a single patch
with a separate cover letter now numbers the output as [PATCH 0/1]
and [PATCH 1/1] by default.

* jk/format-patch-number-singleton-patch-with-cover:
  format-patch: show 0/1 and 1/1 for singleton patch with cover letter
This commit is contained in:
Junio C Hamano
2016-09-08 21:49:47 -07:00
parent c4071eace9 957ed3a56c
commit 452a9073ba
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/log.c
View File

@ -1676,16 +1676,16 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
/* nothing to do */ /* nothing to do */
return 0; return 0;
total = nr; total = nr;
if (!keep_subject && auto_number && total > 1)
numbered = 1;
if (numbered)
rev.total = total + start_number - 1;
if (cover_letter == -1) { if (cover_letter == -1) {
if (config_cover_letter == COVER_AUTO) if (config_cover_letter == COVER_AUTO)
cover_letter = (total > 1); cover_letter = (total > 1);
else else
cover_letter = (config_cover_letter == COVER_ON); cover_letter = (config_cover_letter == COVER_ON);
} }
if (!keep_subject && auto_number && (total > 1 || cover_letter))
numbered = 1;
if (numbered)
rev.total = total + start_number - 1;
if (!signature) { if (!signature) {
; /* --no-signature inhibits all signatures */ ; /* --no-signature inhibits all signatures */

17
t/t4021-format-patch-numbered.sh
View File

@ -36,6 +36,11 @@ test_no_numbered() {
test_num_no_numbered $1 2 test_num_no_numbered $1 2
} }
test_single_cover_letter_numbered() {
grep "^Subject: \[PATCH 0/1\]" $1 &&
grep "^Subject: \[PATCH 1/1\]" $1
}
test_single_numbered() { test_single_numbered() {
grep "^Subject: \[PATCH 1/1\]" $1 grep "^Subject: \[PATCH 1/1\]" $1
} }
@ -121,4 +126,16 @@ test_expect_success '--start-number && --numbered' '
grep "^Subject: \[PATCH 3/3\]" patch8 grep "^Subject: \[PATCH 3/3\]" patch8
' '
test_expect_success 'single patch with cover-letter defaults to numbers' '
git format-patch --cover-letter --stdout HEAD~1 >patch9.single &&
test_single_cover_letter_numbered patch9.single
'
test_expect_success 'Use --no-numbered and --cover-letter single patch' '
git format-patch --no-numbered --stdout --cover-letter HEAD~1 >patch10 &&
test_no_numbered patch10
'
test_done test_done