diff options
| author | Paul Tan <pyokagan@gmail.com> | 2015-07-19 23:49:10 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-20 10:51:37 -0700 |
| commit | b4967ab49003e78bc4555de686a20bc82d56614f (patch) | |
| tree | 0df39d346fd44415fab2c6f890fd2f70fc15cdd0 /t/t4150-am.sh | |
| parent | 528484c6450877ecf3eaa09ed7eb2c583c75f378 (diff) | |
| download | git-b4967ab49003e78bc4555de686a20bc82d56614f.tar.gz | |
t4150: am refuses patches when paused
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.
Reviewed-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4150-am.sh')
| -rwxr-xr-x | t/t4150-am.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t4150-am.sh b/t/t4150-am.sh index a85e06aa03..c350967f02 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh @@ -397,6 +397,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 && |