From: Paul Tan Date: Sun, 19 Jul 2015 15:49:11 +0000 (+0800) Subject: t4150: am --resolved fails if index has no changes X-Git-Tag: v2.6.0-rc0~91^2~7 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/60ff7f9f5c818d1e59daa47467c61ad53be2c5ec t4150: am --resolved fails if index has no changes Since 6d28644 (git-am: do not allow empty commits by mistake., 2006-02-23), git-am --resolved will check to see if the index has any changes to prevent the user from creating an empty commit by mistake. Add a test for this. Reviewed-by: Stefan Beller Reviewed-by: Johannes Schindelin Signed-off-by: Paul Tan Signed-off-by: Junio C Hamano --- diff --git a/t/t4150-am.sh b/t/t4150-am.sh index c350967f02..430ae71aca 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh @@ -425,6 +425,18 @@ test_expect_success 'am --resolved works' ' test_cmp expected another ' +test_expect_success 'am --resolved fails if index has no changes' ' + 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 --resolved && + test_path_is_dir .git/rebase-apply && + test_cmp_rev lorem2^^ HEAD +' + test_expect_success 'am takes patches from a Pine mailbox' ' rm -fr .git/rebase-apply && git reset --hard &&