summaryrefslogtreecommitdiff
path: root/t/t4021-format-patch-numbered.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-05-23 01:40:22 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-05-23 01:40:22 -0700
commit5781e80ffd4cd0c52cdfbf85cac3bb299544a2fc (patch)
tree0513a7f144f2f136eb524b9024bedf4d8410ec8f /t/t4021-format-patch-numbered.sh
parentMerge branch 'do/maint-merge-recursive-fix' (diff)
parentformat-patch let -k override a config-specified format.numbered (diff)
downloadtgif-5781e80ffd4cd0c52cdfbf85cac3bb299544a2fc.tar.xz
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-xt/t4021-format-patch-numbered.sh7
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