From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Alex Henrie <alexhenrie24@gmail.com>, Jeff King <peff@peff.net>,
Junio C Hamano <gitster@pobox.com>,
Elijah Newren <newren@gmail.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
John Keeping <john@keeping.me.uk>,
Richard Hansen <rhansen@rhansen.org>,
Philip Oakley <philipoakley@iee.email>,
"Brian M. Carlson" <sandals@crustytoothpaste.net>,
"W. Trevor King" <wking@tremily.us>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v8 06/10] test: pull-options: revert unnecessary changes
Date: Tue, 24 Nov 2020 21:29:34 -0600 [thread overview]
Message-ID: <20201125032938.786393-7-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20201125032938.786393-1-felipe.contreras@gmail.com>
Commit d18c950a69 changed these tests, but it's unclear why. Probably
because earlier versions of the patch series died instead of printing a
warning.
Cc: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
t/t5521-pull-options.sh | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh
index db1a381cd9..1a4fe2583a 100755
--- a/t/t5521-pull-options.sh
+++ b/t/t5521-pull-options.sh
@@ -11,10 +11,10 @@ test_expect_success 'setup' '
git commit -m one)
'
-test_expect_success 'git pull -q --no-rebase' '
+test_expect_success 'git pull -q' '
mkdir clonedq &&
(cd clonedq && git init &&
- git pull -q --no-rebase "../parent" >out 2>err &&
+ git pull -q "../parent" >out 2>err &&
test_must_be_empty err &&
test_must_be_empty out)
'
@@ -30,10 +30,10 @@ test_expect_success 'git pull -q --rebase' '
test_must_be_empty out)
'
-test_expect_success 'git pull --no-rebase' '
+test_expect_success 'git pull' '
mkdir cloned &&
(cd cloned && git init &&
- git pull --no-rebase "../parent" >out 2>err &&
+ git pull "../parent" >out 2>err &&
test -s err &&
test_must_be_empty out)
'
@@ -46,10 +46,10 @@ test_expect_success 'git pull --rebase' '
test_must_be_empty out)
'
-test_expect_success 'git pull -v --no-rebase' '
+test_expect_success 'git pull -v' '
mkdir clonedv &&
(cd clonedv && git init &&
- git pull -v --no-rebase "../parent" >out 2>err &&
+ git pull -v "../parent" >out 2>err &&
test -s err &&
test_must_be_empty out)
'
@@ -62,25 +62,25 @@ test_expect_success 'git pull -v --rebase' '
test_must_be_empty out)
'
-test_expect_success 'git pull -v -q --no-rebase' '
+test_expect_success 'git pull -v -q' '
mkdir clonedvq &&
(cd clonedvq && git init &&
- git pull -v -q --no-rebase "../parent" >out 2>err &&
+ git pull -v -q "../parent" >out 2>err &&
test_must_be_empty out &&
test_must_be_empty err)
'
-test_expect_success 'git pull -q -v --no-rebase' '
+test_expect_success 'git pull -q -v' '
mkdir clonedqv &&
(cd clonedqv && git init &&
- git pull -q -v --no-rebase "../parent" >out 2>err &&
+ git pull -q -v "../parent" >out 2>err &&
test_must_be_empty out &&
test -s err)
'
test_expect_success 'git pull --cleanup errors early on invalid argument' '
mkdir clonedcleanup &&
(cd clonedcleanup && git init &&
- test_must_fail git pull --no-rebase --cleanup invalid "../parent" >out 2>err &&
+ test_must_fail git pull --cleanup invalid "../parent" >out 2>err &&
test_must_be_empty out &&
test -s err)
'
--
2.29.2
next prev parent reply other threads:[~2020-11-25 3:31 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-25 3:29 [PATCH v8 00/10] Reject non-ff pulls by default Felipe Contreras
2020-11-25 3:29 ` [PATCH v8 01/10] pull: refactor fast-forward check Felipe Contreras
2020-11-25 3:29 ` [PATCH v8 02/10] pull: cleanup autostash check Felipe Contreras
2020-11-25 3:29 ` [PATCH v8 03/10] pull: trivial cleanup Felipe Contreras
2020-11-25 3:29 ` [PATCH v8 04/10] pull: move default warning Felipe Contreras
2020-11-25 3:29 ` [PATCH v8 05/10] pull: display default warning only when non-ff Felipe Contreras
2020-11-25 3:29 ` Felipe Contreras [this message]
2020-11-25 3:29 ` [PATCH v8 07/10] rebase: add REBASE_DEFAULT Felipe Contreras
2020-11-25 3:29 ` [PATCH v8 08/10] pull: add pull.mode Felipe Contreras
2020-11-25 12:31 ` Philip Oakley
2020-12-02 5:04 ` Felipe Contreras
2020-11-25 3:29 ` [PATCH v8 09/10] pull: add pull.mode=ff-only Felipe Contreras
2020-11-25 3:29 ` [PATCH v8 10/10] pull: improve default warning Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201125032938.786393-7-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=alexhenrie24@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=john@keeping.me.uk \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=philipoakley@iee.email \
--cc=rhansen@rhansen.org \
--cc=sandals@crustytoothpaste.net \
--cc=wking@tremily.us \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).