git: update to v2.40.0

[ps-cgit] / tests / t0108-patch.sh

diff --git a/tests/t0108-patch.sh b/tests/t0108-patch.sh
index 3b5bae44257b40cf655e57e2b20f1afabe7428ad..013d68024d5df8ef1ad8764de80a9d65d624a525 100755 (executable)
--- a/tests/t0108-patch.sh
+++ b/tests/t0108-patch.sh
@@ -20,11 +20,18 @@ test_expect_success 'find `Subject:` line' '
 '
 
 test_expect_success 'find `cgit` signature' '
-       tail -1 tmp | grep "^cgit"
+       tail -2 tmp | head -1 | grep "^cgit"
+'
+
+test_expect_success 'compare with output of git-format-patch(1)' '
+       CGIT_VERSION=$(sed -n "s/CGIT_VERSION = //p" ../../VERSION) &&
+       git --git-dir="$PWD/repos/foo/.git" format-patch --subject-prefix="" --signature="cgit $CGIT_VERSION" --stdout HEAD^ >tmp2 &&
+       strip_headers <tmp >tmp_ &&
+       test_cmp tmp_ tmp2
 '
 
 test_expect_success 'find initial commit' '
-       root=$(git --git-dir="$PWD/repos/foo/.git" rev-list HEAD | tail -1)
+       root=$(git --git-dir="$PWD/repos/foo/.git" rev-list --max-parents=0 HEAD)
 '
 
 test_expect_success 'generate patch for initial commit' '
@@ -32,7 +39,24 @@ test_expect_success 'generate patch for initial commit' '
 '
 
 test_expect_success 'find `cgit` signature' '
-       tail -1 tmp | grep "^cgit"
+       tail -2 tmp | head -1 | grep "^cgit"
+'
+
+test_expect_success 'generate patches for multiple commits' '
+       id=$(git --git-dir="$PWD/repos/foo/.git" rev-parse HEAD) &&
+       id2=$(git --git-dir="$PWD/repos/foo/.git" rev-parse HEAD~3) &&
+       cgit_query "url=foo/patch&id=$id&id2=$id2" >tmp
+'
+
+test_expect_success 'find `cgit` signature' '
+       tail -2 tmp | head -1 | grep "^cgit"
+'
+
+test_expect_success 'compare with output of git-format-patch(1)' '
+       CGIT_VERSION=$(sed -n "s/CGIT_VERSION = //p" ../../VERSION) &&
+       git --git-dir="$PWD/repos/foo/.git" format-patch -N --subject-prefix="" --signature="cgit $CGIT_VERSION" --stdout HEAD~3..HEAD >tmp2 &&
+       strip_headers <tmp >tmp_ &&
+       test_cmp tmp_ tmp2
 '
 
 test_done