diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-21 18:51:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-21 18:51:30 -0700 |
| commit | f47af92594b0bdc2f634c1fd491999ad04b772dd (patch) | |
| tree | e64041fa5bf206803bf218bb779533155d9cd17d /t | |
| parent | 3a2dd481e51ed3ea01b84c7db4c661a0a3d5279c (diff) | |
| parent | af12fb7b3048c5bdd2e90885a6736ebc29d84f01 (diff) | |
| download | git-f47af92594b0bdc2f634c1fd491999ad04b772dd.tar.gz git-f47af92594b0bdc2f634c1fd491999ad04b772dd.tar.xz | |
Merge branch 'bc/maint-am-email' into maint
* bc/maint-am-email:
git-am: print fair error message when format detection fails
am: allow individual e-mail files as input
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4150-am.sh | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t4150-am.sh b/t/t4150-am.sh index a12bf8462..829660523 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh @@ -77,6 +77,12 @@ 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 && sed -n -e "3,\$p" msg >file && git add file && test_tick && @@ -108,6 +114,15 @@ 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^)" +' + GIT_AUTHOR_NAME="Another Thor" GIT_AUTHOR_EMAIL="a.thor@example.com" GIT_COMMITTER_NAME="Co M Miter" |