[PATCH 04/12] t4150: am refuses patches when paused
From: Paul Tan <hidden>
Date: 2016-06-15 23:05:38
Subsystem:
the rest · Maintainer:
Linus Torvalds
Since c95b138 (Fix git-am safety checks, 2006-09-15), when there is a session in progress, git-am will check the command-line arguments and standard input to ensure that the user does not pass it any patches. Add a test for this. Cc: Junio C Hamano <redacted> Signed-off-by: Paul Tan <redacted> --- t/t4150-am.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 0a19136..e5506f5 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh@@ -396,6 +396,20 @@ test_expect_success 'am --abort removes a stray directory' ' test_path_is_missing .git/rebase-apply ' +test_expect_success 'am refuses patches when paused' ' + rm -fr .git/rebase-apply && + git reset --hard && + git checkout lorem2^^ && + + test_must_fail git am lorem-move.patch && + test_path_is_dir .git/rebase-apply && + test_cmp_rev lorem2^^ HEAD && + + test_must_fail git am <lorem-move.patch && + test_path_is_dir .git/rebase-apply && + test_cmp_rev lorem2^^ HEAD +' + test_expect_success 'am --resolved works' ' echo goodbye >expected && rm -fr .git/rebase-apply &&
--
2.5.0.rc1.81.gfe77482