From: Mehul Jain Date: Tue, 29 Mar 2016 13:30:00 GMT Subject: [PATCH 5/5] t/t5520: test --[no-]autostash with pull.rebase=true Message-ID: <1459258200-32444-6-git-send-email-mehul.jain2029@gmail.com> In-Reply-To: <1459258200-32444-1-git-send-email-mehul.jain2029@gmail.com> "--[no-]autostash" option for git-pull is only valid in rebase mode. That is, either --rebase is 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 --- t/t5520-pull.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 2611170..4da9e52 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -316,6 +316,26 @@ test_expect_success 'pull.rebase' ' test new = "$(git show HEAD:file2)" ' +test_expect_success 'pull --autostash & pull.rebase=true' ' + test_config pull.rebase true && + git reset --hard before-rebase && + echo dirty >new_file && + git add new_file && + git pull --autostash . copy && + test_cmp_rev HEAD^ copy && + test "$(cat new_file)" = dirty && + test "$(cat file)" = "modified again" +' + +test_expect_success 'pull --no-autostash & pull.rebase=true' ' + test_config pull.rebase true && + git reset --hard before-rebase && + echo dirty >new_file && + git add new_file && + test_must_fail git pull --no-autostash . copy 2>err && + test_i18ngrep "Cannot pull with rebase: Your index contains uncommitted changes." err +' + 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