[PATCH v2 7/7] t5520: test --[no-]autostash with pull.rebase=true

From: Mehul Jain <mehul.jain2029@gmail.com>
Date: Apr 2, 2016, 17:58 UTC
Message-ID: <1459619912-5445-8-git-send-email-mehul.jain2029@gmail.com>
In-Reply-To: <1459619912-5445-1-git-send-email-mehul.jain2029@gmail.com>

"--[no-]autostash" option for git-pull is only valid in rebase mode( i.e. either --rebase should be used or pull.rebase=true). Existing tests already check the cases when --rebase is used but fails to check for pull.rebase=true case.

Add two new tests to check that --[no-]autostash option works with pull.rebase=true.

Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com>
---
 t/t5520-pull.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index e12af96..bed75f5 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -314,6 +314,16 @@ test_expect_success 'pull.rebase' '
 	test new = "$(git show HEAD:file2)"
 '
 
+test_expect_success 'pull --autostash & pull.rebase=true' '
+	test_config pull.rebase true &&
+	test_pull_autostash --autostash
+'
+
+test_expect_success 'pull --no-autostash & pull.rebase=true' '
+	test_config pull.rebase true &&
+	test_pull_autostash_fail --no-autostash
+'
+
 test_expect_success 'branch.to-rebase.rebase' '
 	git reset --hard before-rebase &&
 	test_config branch.to-rebase.rebase true &&

-- 
2.7.1.340.g69eb491.dirty