Skip to content
Permalink
Browse files

t5520: test --[no-]autostash with pull.rebase=true

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

Add two new tests to check that the --[no-]autostash options work
with pull.rebase=true.

Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information...
mehul2029 authored and gitster committed Apr 2, 2016
1 parent 1662297 commit 450dd1dce1fbf6a6743e74d6aef750068fc5069c
Showing with 10 additions and 0 deletions.
  1. +10 −0 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 &&

0 comments on commit 450dd1d

Please sign in to comment.
You can’t perform that action at this time.