"martin f. krafft" <madduck@xxxxxxxxxxx> writes: > The patch does not touch t/t4252-am-options.sh (yet) because I do not really > understand how the testing system works. I'll squash this in, then. Thanks. t/t4252-am-options.sh | 11 ++++++++++- t/t4252/am-test-6-1 | 21 +++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletions(-) diff --git c/t/t4252-am-options.sh i/t/t4252-am-options.sh index 5fdd188..f603c1b 100755 --- c/t/t4252-am-options.sh +++ i/t/t4252-am-options.sh @@ -1,6 +1,6 @@ #!/bin/sh -test_description='git am not losing options' +test_description='git am with options and not losing them' . ./test-lib.sh tm="$TEST_DIRECTORY/t4252" @@ -66,4 +66,13 @@ test_expect_success 'apply to a funny path' ' test -f "$with_sq/file-5" ' +test_expect_success 'am --reject' ' + rm -rf .git/rebase-apply && + git reset --hard initial && + test_must_fail git am --reject "$tm"/am-test-6-1 && + grep "@@ -1,3 +1,3 @@" file-2.rej && + test_must_fail git diff-files --exit-code --quiet file-2 && + grep "[-]-reject" .git/rebase-apply/apply-opt +' + test_done diff --git c/t/t4252/am-test-6-1 i/t/t4252/am-test-6-1 new file mode 100644 index 0000000..a8859e9 --- /dev/null +++ i/t/t4252/am-test-6-1 @@ -0,0 +1,21 @@ +From: A U Thor <au.thor@xxxxxxxxxxx> +Date: Thu Dec 4 16:00:00 2008 -0800 +Subject: Huh + +Should fail and leave rejects + +diff --git i/file-2 w/file-2 +index 06e567b..b6f3a16 100644 +--- i/file-2 ++++ w/file-2 +@@ -1,3 +1,3 @@ +-0 ++One + 2 + 3 +@@ -4,4 +4,4 @@ + 4 + 5 +-6 ++Six + 7 -- 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
