diff options
| author |  Mehul Jain <mehul.jain2029@gmail.com> | 2016-04-02 23:28:31 +0530 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-04-04 11:15:01 -0700 |
| commit | 16622979f8eaf864da5cf932d3d60de7c7d40d7d (patch) | |
| tree | 482d09040a320e8571b3b4fb76907bcbbd1a3d73 | |
| parent | t5520: factor out common "failing autostash" code (diff) | |
| download | tgif-16622979f8eaf864da5cf932d3d60de7c7d40d7d.tar.xz | |
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 <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>
| -rwxr-xr-x | t/t5520-pull.sh | 16 |
1 files changed, 7 insertions, 9 deletions
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 && |