This test adds test for git-am dos line endings, the command sequence 'git format-patch ... | git am ...' and the configuration variable `am.keepcr`. Signed-off-by: Stefan-W. Hahn <stefan.hahn@xxxxxxxxx> --- t/t4253-am-keep-cr-dos.sh | 68 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) create mode 100644 t/t4253-am-keep-cr-dos.sh diff --git a/t/t4253-am-keep-cr-dos.sh b/t/t4253-am-keep-cr-dos.sh new file mode 100644 index 0000000..a4f5f80 --- /dev/null +++ b/t/t4253-am-keep-cr-dos.sh @@ -0,0 +1,68 @@ +#!/bin/sh +# +# Copyright (c) 2010 Stefan-W. Hahn +# + +test_description='git-am mbox with dos line ending. + +' +. ./test-lib.sh + +# Three patches which will be added as files with dos line ending. + +cat > file1 <<\EOF +line 1 +EOF + +cat > file2 <<\EOF +line 1 +line 2 +EOF + +cat > file3 <<\EOF +line 1 +line 2 +line 3 +EOF + +test_expect_success 'setup repository with dos files' ' + append_cr <file1 >file + git add file && + git commit -m Initial && + git tag start && + append_cr <file2 >file + git commit -a -m Second && + git tag start2 && + append_cr <file3 >file + git commit -a -m Third && + git format-patch -k --stdout start.. > format-patch.diff +' + +test_expect_success 'mailsplit format-patch of dos files' ' + mkdir split && + git mailsplit -osplit format-patch.diff && + cat split/0001 split/0002 > mailsplit.diff && + test_must_fail test_cmp format-patch.diff mailsplit.diff +' + +test_expect_success 'mailsplit --keep-cr format-patch of dos files' ' + mkdir split2 && + git mailsplit --keep-cr -osplit2 format-patch.diff && + cat split2/0001 split2/0002 > mailsplit2.diff && + test_cmp format-patch.diff mailsplit2.diff +' + +test_expect_success 'format-patch with dos files --keep-cr' ' + git checkout -b new start && + git format-patch -k --stdout start..master | git am --keep-cr -k -3 && + git diff master +' + +test_expect_success 'format-patch with dos files config.mailsplit' ' + git config am.keepcr 1 && + git checkout -b new3 start && + git format-patch -k --stdout start..master | git am -k -3 && + git diff master +' + +test_done -- 1.7.0.rc2.31.g49e2a -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html