From: Mehul Jain Date: Sat, 2 Apr 2016 17:58:31 +0000 (+0530) Subject: t5520: reduce commom lines of code X-Git-Tag: v2.9.0-rc0~123^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16622979f8eaf864da5cf932d3d60de7c7d40d7d;p=thirdparty%2Fgit.git t5520: reduce commom lines of code These two tests are almost similar and thus can be folded in a for-loop. Helped-by: Eric Sunshine Signed-off-by: Mehul Jain Reviewed-by: Eric Sunshine Signed-off-by: Junio C Hamano --- diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 7392ee1433..8b0c9d8988 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -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 &&