mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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>
This commit is contained in:
parent
16622979f8
commit
450dd1dce1
|
@ -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 &&
|
||||
|
|
Loading…
Reference in a new issue