t5520: factor out common "failing autostash" code

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>

diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 0b52a3497eefb29a71748d99d4cc2c6e59477291..7392ee1433dd4321d7adee0788de209ef58b767e 100755 (executable)
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -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 '
        echo file >file &&
        git add file &&
 test_expect_success setup '
        echo file >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_config rebase.autostash true &&
 
 test_expect_success 'pull --rebase --no-autostash & rebase.autostash=true' '
        test_config rebase.autostash true &&

-       git reset --hard before-rebase &&
-       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_pull_autostash_fail --rebase --no-autostash

 '
 
 test_expect_success 'pull --rebase --no-autostash & rebase.autostash=false' '
        test_config rebase.autostash false &&
 '
 
 test_expect_success 'pull --rebase --no-autostash & rebase.autostash=false' '
        test_config rebase.autostash false &&

-       git reset --hard before-rebase &&
-       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_pull_autostash_fail --rebase --no-autostash

 '
 
 test_expect_success 'pull --rebase --no-autostash & rebase.autostash unset' '
        test_unconfig rebase.autostash &&
 '
 
 test_expect_success 'pull --rebase --no-autostash & rebase.autostash unset' '
        test_unconfig rebase.autostash &&

-       git reset --hard before-rebase &&
-       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_pull_autostash_fail --rebase --no-autostash

 '
 
 test_expect_success 'pull --autostash (without --rebase) should error out' '
 '
 
 test_expect_success 'pull --autostash (without --rebase) should error out' '