diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-09 04:49:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-09 04:49:47 (GMT) |
| commit | 452a9073ba9f1fb157b3e5710b718aaf802e7631 (patch) | |
| tree | 80cd21be4042097a0d2ed5a3bc7e96f6e0f22fd5 | |
| parent | c4071eace94a7dca1cc0c0702fc0d4f23d2fc510 (diff) | |
| parent | 957ed3a56c50f5c542e0cac58d75e1d4b9658ac3 (diff) | |
| download | git-452a9073ba9f1fb157b3e5710b718aaf802e7631.zip git-452a9073ba9f1fb157b3e5710b718aaf802e7631.tar.gz git-452a9073ba9f1fb157b3e5710b718aaf802e7631.tar.bz2 | |
Merge branch 'jk/format-patch-number-singleton-patch-with-cover'
"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
| -rw-r--r-- | builtin/log.c | 8 | ||||
| -rwxr-xr-x | t/t4021-format-patch-numbered.sh | 17 |
2 files changed, 21 insertions, 4 deletions
diff --git a/builtin/log.c b/builtin/log.c index 92dc34d..49aa534 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1676,16 +1676,16 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) /* nothing to do */ return 0; total = nr; - if (!keep_subject && auto_number && total > 1) - numbered = 1; - if (numbered) - rev.total = total + start_number - 1; if (cover_letter == -1) { if (config_cover_letter == COVER_AUTO) cover_letter = (total > 1); else 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) { ; /* --no-signature inhibits all signatures */ diff --git a/t/t4021-format-patch-numbered.sh b/t/t4021-format-patch-numbered.sh index 886494b..9be65fd 100755 --- a/t/t4021-format-patch-numbered.sh +++ b/t/t4021-format-patch-numbered.sh @@ -36,6 +36,11 @@ test_no_numbered() { 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() { grep "^Subject: \[PATCH 1/1\]" $1 } @@ -121,4 +126,16 @@ test_expect_success '--start-number && --numbered' ' 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 |