summaryrefslogtreecommitdiff
path: root/t/t4021-format-patch-numbered.sh
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2009-05-09 10:12:01 +0200
committerJunio C Hamano <gitster@pobox.com>2009-05-09 08:10:15 -0700
commitca6b91d29b7ea937b71f62bf00ba7750f3e594ce (patch)
treebf7365b1d182c66926684c74eb0c0161588cde44 /t/t4021-format-patch-numbered.sh
parentf01f1099f40f24fe6f7802185340a6fa3a3d4f35 (diff)
downloadgit-ca6b91d29b7ea937b71f62bf00ba7750f3e594ce.tar.gz
format-patch let -k override a config-specified format.numbered
Let a command-line --keep-subject (-k) override a config-specified format.numbered (--numbered (-n)), rather than provoking the "-n and -k are mutually exclusive" failure. * t4021-format-patch-numbered.sh: Test for the above Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 390af2389f..9b6e1be8b2 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