sha1_name: add get_sha1_with_context()

diff --git a/t/t4021-format-patch-numbered.sh b/t/t4021-format-patch-numbered.sh
index 43d64bbd826049c5a0a8cf365ed5cb3f4489752c..709b3231ca8d9da631727b4aadfb2f46049d37e9 100755 (executable)
--- a/t/t4021-format-patch-numbered.sh
+++ b/t/t4021-format-patch-numbered.sh
@@ -45,17 +45,22 @@ test_numbered() {
        grep "^Subject: \[PATCH 2/2\]" $1
 }
 
-test_expect_success 'Default: no numbered' '
+test_expect_success 'single patch defaults to no numbers' '
+       git format-patch --stdout HEAD~1 >patch0.single &&
+       test_single_no_numbered patch0.single
+'
+
+test_expect_success 'multiple patch defaults to numbered' '
 
-       git format-patch --stdout HEAD~2 >patch0 &&
-       test_no_numbered patch0
+       git format-patch --stdout HEAD~2 >patch0.multiple &&
+       test_numbered patch0.multiple
 
 '
 
 test_expect_success 'Use --numbered' '
 
-       git format-patch --numbered --stdout HEAD~2 >patch1 &&
-       test_numbered patch1
+       git format-patch --numbered --stdout HEAD~1 >patch1 &&
+       test_single_numbered patch1
 
 '
 
@@ -81,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
@@ -103,4 +115,10 @@ test_expect_success 'format.numbered = auto && --no-numbered' '
 
 '
 
+test_expect_success '--start-number && --numbered' '
+
+       git format-patch --start-number 3 --numbered --stdout HEAD~1 > patch8 &&
+       grep "^Subject: \[PATCH 3/3\]" patch8
+'
+
 test_done