These two tests are almost similar and thus can be folded in a for-loop.
Helped-by: Eric Sunshine <[email protected]>
Signed-off-by: Mehul Jain <[email protected]>
---
t/t5520-pull.sh | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index fb9f845..e12af96 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 autostash_flag in --autostash --no-autostash
+do
+ test_expect_success "pull $autostash_flag (without --rebase) is
illegal" '
+ test_must_fail git pull $autostash_flag . copy 2>err &&
+ test_i18ngrep "only valid with --rebase" err
+ '
+done
test_expect_success 'pull.rebase' '
git reset --hard before-rebase &&
--
2.7.1.340.g69eb491.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
