diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 51c369ad1428330b917ffe50ba9963d59be650ea..a12bf846231d18b2a815151d1a0e1ab3d5f491d1 100755 (executable)
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
test -z "$(git diff lorem)"
'
+test_expect_success 'am -3 -q is quiet' '
+ git reset master2 --hard &&
+ sed -n -e "3,\$p" msg >file &&
+ head -n 9 msg >>file &&
+ git add file &&
+ test_tick &&
+ git commit -m "copied stuff" &&
+ git am -3 -q lorem-move.patch > output.out 2>&1 &&
+ ! test -s output.out
+'
+
test_expect_success 'am pauses on conflict' '
git checkout lorem2^^ &&
test_must_fail git am lorem-move.patch &&
grep "^Applying: second \\\n foo$" output.out
'
+test_expect_success 'am -q is quiet' '
+ git checkout first &&
+ test_tick &&
+ git am -q < patch1 > output.out 2>&1 &&
+ ! test -s output.out
+'
+
test_done