X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4252-am-options.sh;h=f603c1b1336c4a00889177376d9b51077c9cc2ac;hb=0e1aa2f7af6cc11c56a780764ef0ca94c19f0724;hp=5fdd1885820927f32822019ccde52e6b783e31eb;hpb=0aac1614e976164259edf5f950da4cbebe069466;p=git.git

diff --git a/t/t4252-am-options.sh b/t/t4252-am-options.sh
index 5fdd18858..f603c1b13 100755
--- a/t/t4252-am-options.sh
+++ b/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