diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-26 06:03:52 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-26 06:03:52 +0400 |
| commit | 597a1782460085105f7530c815e79cbb1de272d9 (patch) | |
| tree | 88e74d5dc3af901307b4545df9c2eba0c6b5439a /t | |
| parent | 5c44cc9ea29b74ed10f5f239791b2c2f9586f197 (diff) | |
| parent | ca6b91d29b7ea937b71f62bf00ba7750f3e594ce (diff) | |
Merge branch 'jm/format-patch-no-auto-n-when-k-is-given' into maint
* jm/format-patch-no-auto-n-when-k-is-given:
format-patch let -k override a config-specified format.numbered
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4021-format-patch-numbered.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t4021-format-patch-numbered.sh b/t/t4021-format-patch-numbered.sh index 3c27f0dc19..709b3231ca 100755 --- a/t/t4021-format-patch-numbered.sh +++ b/t/t4021-format-patch-numbered.sh @@ -86,6 +86,13 @@ test_expect_success 'format.numbered && --no-numbered' ' ' +test_expect_success 'format.numbered && --keep-subject' ' + + git format-patch --keep-subject --stdout HEAD^ >patch4a && + grep "^Subject: Third" patch4a + +' + test_expect_success 'format.numbered = auto' ' git config format.numbered auto |