File tree Expand file tree Collapse file tree 1 file changed +7
-9
lines changed Expand file tree Collapse file tree 1 file changed +7
-9
lines changed Original file line number Diff line number Diff line change @@ -298,15 +298,13 @@ test_expect_success 'pull --rebase --no-autostash & rebase.autostash unset' '
298
298
test_pull_autostash_fail --rebase --no-autostash
299
299
'
300
300
301
- test_expect_success ' pull --autostash (without --rebase) should error out' '
302
- test_must_fail git pull --autostash . copy 2>err &&
303
- test_i18ngrep "only valid with --rebase" err
304
- '
305
-
306
- test_expect_success ' pull --no-autostash (without --rebase) should error out' '
307
- test_must_fail git pull --no-autostash . copy 2>err &&
308
- test_i18ngrep "only valid with --rebase" err
309
- '
301
+ for i in --autostash --no-autostash
302
+ do
303
+ test_expect_success " pull $i (without --rebase) is illegal" '
304
+ test_must_fail git pull $i . copy 2>err &&
305
+ test_i18ngrep "only valid with --rebase" err
306
+ '
307
+ done
310
308
311
309
test_expect_success ' pull.rebase' '
312
310
git reset --hard before-rebase &&
You can’t perform that action at this time.
0 commit comments