diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-23 08:40:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-23 08:40:22 (GMT) |
| commit | 5781e80ffd4cd0c52cdfbf85cac3bb299544a2fc (patch) | |
| tree | 0513a7f144f2f136eb524b9024bedf4d8410ec8f /t/t4021-format-patch-numbered.sh | |
| parent | d32643c0ff6d74b967b65e867f1f99dba840836e (diff) | |
| parent | ca6b91d29b7ea937b71f62bf00ba7750f3e594ce (diff) | |
| download | git-5781e80ffd4cd0c52cdfbf85cac3bb299544a2fc.zip git-5781e80ffd4cd0c52cdfbf85cac3bb299544a2fc.tar.gz git-5781e80ffd4cd0c52cdfbf85cac3bb299544a2fc.tar.bz2 | |
Merge branch 'jm/format-patch-no-auto-n-when-k-is-given'
* jm/format-patch-no-auto-n-when-k-is-given:
format-patch let -k override a config-specified format.numbered
Diffstat (limited to 't/t4021-format-patch-numbered.sh')
| -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 3c27f0d..709b323 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 |