undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t5520: factor out common "failing autostash" code

Browse Source 
Three tests contains repetitive lines of code.

Factor out common code into test_pull_autostash_fail() and then call it in
these tests.

Helped-by: Eric Sunshine <sunshine@sunshineco.com>
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:
Mehul Jain 2016-04-02 23:28:30 +05:30 committed by Junio C Hamano
parent 5c82bcddf4
commit 44a59fff45
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
t/t5520-pull.sh
View File

@ -19,6 +19,14 @@ test_pull_autostash () {
test "$(cat file)" = "modified again" test "$(cat file)" = "modified again"
} }
test_pull_autostash_fail () {
git reset --hard before-rebase &&
echo dirty >new_file &&
git add new_file &&
test_must_fail git pull "$@" . copy 2>err &&
test_i18ngrep "uncommitted changes." err
}
test_expect_success setup ' test_expect_success setup '
echo file >file && echo file >file &&
git add file && git add file &&
@ -277,29 +285,17 @@ test_expect_success 'pull --rebase --autostash & rebase.autostash unset' '
test_expect_success 'pull --rebase --no-autostash & rebase.autostash=true' ' test_expect_success 'pull --rebase --no-autostash & rebase.autostash=true' '
test_config rebase.autostash true && test_config rebase.autostash true &&
git reset --hard before-rebase && test_pull_autostash_fail --rebase --no-autostash
echo dirty >new_file &&
git add new_file &&
test_must_fail git pull --rebase --no-autostash . copy 2>err &&
test_i18ngrep "Cannot pull with rebase: Your index contains uncommitted changes." err
' '
test_expect_success 'pull --rebase --no-autostash & rebase.autostash=false' ' test_expect_success 'pull --rebase --no-autostash & rebase.autostash=false' '
test_config rebase.autostash false && test_config rebase.autostash false &&
git reset --hard before-rebase && test_pull_autostash_fail --rebase --no-autostash
echo dirty >new_file &&
git add new_file &&
test_must_fail git pull --rebase --no-autostash . copy 2>err &&
test_i18ngrep "Cannot pull with rebase: Your index contains uncommitted changes." err
' '
test_expect_success 'pull --rebase --no-autostash & rebase.autostash unset' ' test_expect_success 'pull --rebase --no-autostash & rebase.autostash unset' '
test_unconfig rebase.autostash && test_unconfig rebase.autostash &&
git reset --hard before-rebase && test_pull_autostash_fail --rebase --no-autostash
echo dirty >new_file &&
git add new_file &&
test_must_fail git pull --rebase --no-autostash . copy 2>err &&
test_i18ngrep "Cannot pull with rebase: Your index contains uncommitted changes." err
' '
test_expect_success 'pull --autostash (without --rebase) should error out' ' test_expect_success 'pull --autostash (without --rebase) should error out' '