t5520: reduce commom lines of code
authorMehul Jain <mehul.jain2029@gmail.com>
Sat, 2 Apr 2016 17:58:31 +0000 (23:28 +0530)
committerJunio C Hamano <gitster@pobox.com>
Mon, 4 Apr 2016 18:15:01 +0000 (11:15 -0700)
These two tests are almost similar and thus can be folded in a for-loop.

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>
t/t5520-pull.sh
index 7392ee1433dd4321d7adee0788de209ef58b767e..8b0c9d8988ae6897a650663b7182ba618f5174bd 100755 (executable)
@@ -298,15 +298,13 @@ test_expect_success 'pull --rebase --no-autostash & rebase.autostash unset' '
        test_pull_autostash_fail --rebase --no-autostash
 '
 
-test_expect_success 'pull --autostash (without --rebase) should error out' '
-       test_must_fail git pull --autostash . copy 2>err &&
-       test_i18ngrep "only valid with --rebase" err
-'
-
-test_expect_success 'pull --no-autostash (without --rebase) should error out' '
-       test_must_fail git pull --no-autostash . copy 2>err &&
-       test_i18ngrep "only valid with --rebase" err
-'
+for i in --autostash --no-autostash
+do
+       test_expect_success "pull $i (without --rebase) is illegal" '
+               test_must_fail git pull $i . copy 2>err &&
+               test_i18ngrep "only valid with --rebase" err
+       '
+done
 
 test_expect_success 'pull.rebase' '
        git reset --hard before-rebase &&