remote-helpers: add tests for testgit helper

diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index a12bf846231d18b2a815151d1a0e1ab3d5f491d1..810b04b817c79d2b4c478f767843b4e7a42e0bed 100755 (executable)
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -77,6 +77,18 @@ test_expect_success setup '
        git commit -s -F msg &&
        git tag second &&
        git format-patch --stdout first >patch1 &&
+       {
+               echo "X-Fake-Field: Line One" &&
+               echo "X-Fake-Field: Line Two" &&
+               echo "X-Fake-Field: Line Three" &&
+               git format-patch --stdout first | sed -e "1d"
+       } > patch1.eml &&
+       {
+               echo "X-Fake-Field: Line One" &&
+               echo "X-Fake-Field: Line Two" &&
+               echo "X-Fake-Field: Line Three" &&
+               git format-patch --stdout first | sed -e "1d"
+       } | append_cr >patch1-crlf.eml &&
        sed -n -e "3,\$p" msg >file &&
        git add file &&
        test_tick &&
@@ -108,6 +120,24 @@ test_expect_success 'am applies patch correctly' '
        test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)"
 '
 
+test_expect_success 'am applies patch e-mail not in a mbox' '
+       git checkout first &&
+       git am patch1.eml &&
+       ! test -d .git/rebase-apply &&
+       test -z "$(git diff second)" &&
+       test "$(git rev-parse second)" = "$(git rev-parse HEAD)" &&
+       test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)"
+'
+
+test_expect_success 'am applies patch e-mail not in a mbox with CRLF' '
+       git checkout first &&
+       git am patch1-crlf.eml &&
+       ! test -d .git/rebase-apply &&
+       test -z "$(git diff second)" &&
+       test "$(git rev-parse second)" = "$(git rev-parse HEAD)" &&
+       test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)"
+'
+
 GIT_AUTHOR_NAME="Another Thor"
 GIT_AUTHOR_EMAIL="a.thor@example.com"
 GIT_COMMITTER_NAME="Co M Miter"
@@ -272,7 +302,7 @@ test_expect_success 'am --committer-date-is-author-date' '
        git checkout first &&
        test_tick &&
        git am --committer-date-is-author-date patch1 &&
-       git cat-file commit HEAD | sed -e "/^$/q" >head1 &&
+       git cat-file commit HEAD | sed -e "/^\$/q" >head1 &&
        at=$(sed -ne "/^author /s/.*> //p" head1) &&
        ct=$(sed -ne "/^committer /s/.*> //p" head1) &&
        test "$at" = "$ct"
@@ -282,7 +312,7 @@ test_expect_success 'am without --committer-date-is-author-date' '
        git checkout first &&
        test_tick &&
        git am patch1 &&
-       git cat-file commit HEAD | sed -e "/^$/q" >head1 &&
+       git cat-file commit HEAD | sed -e "/^\$/q" >head1 &&
        at=$(sed -ne "/^author /s/.*> //p" head1) &&
        ct=$(sed -ne "/^committer /s/.*> //p" head1) &&
        test "$at" != "$ct"
@@ -296,7 +326,7 @@ test_expect_success 'am --ignore-date' '
        git checkout first &&
        test_tick &&
        git am --ignore-date patch1 &&
-       git cat-file commit HEAD | sed -e "/^$/q" >head1 &&
+       git cat-file commit HEAD | sed -e "/^\$/q" >head1 &&
        at=$(sed -ne "/^author /s/.*> //p" head1) &&
        echo "$at" | grep "+0000"
 '