From: Denton Liu <liu.denton@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Christian Biesinger <cbiesinger@google.com>,
Eric Sunshine <sunshine@sunshineco.com>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v3 3/5] t4014: use test_config()
Date: Tue, 3 Dec 2019 23:47:56 -0800 [thread overview]
Message-ID: <638c4add00657daa9b7a4fa50882053335d5caef.1575445583.git.liu.denton@gmail.com> (raw)
In-Reply-To: <cover.1575445582.git.liu.denton@gmail.com>
Instead of manually unsetting the config after the test case is done,
use test_config() to do it automatically. While we're at it, fix a typo
in a test case name.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
---
t/t4014-format-patch.sh | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 69267b16f0..c7cc643adf 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -1939,10 +1939,9 @@ test_expect_success 'format-patch errors out when history involves criss-cross'
test_must_fail git format-patch --base=auto -1
'
-test_expect_success 'format-patch format.useAutoBaseoption' '
- test_when_finished "git config --unset format.useAutoBase" &&
+test_expect_success 'format-patch format.useAutoBase option' '
git checkout local &&
- git config format.useAutoBase true &&
+ test_config format.useAutoBase true &&
git format-patch --stdout -1 >patch &&
grep "^base-commit:" patch >actual &&
git rev-parse upstream >commit-id-base &&
@@ -1951,8 +1950,7 @@ test_expect_success 'format-patch format.useAutoBaseoption' '
'
test_expect_success 'format-patch --base overrides format.useAutoBase' '
- test_when_finished "git config --unset format.useAutoBase" &&
- git config format.useAutoBase true &&
+ test_config format.useAutoBase true &&
git format-patch --stdout --base=HEAD~1 -1 >patch &&
grep "^base-commit:" patch >actual &&
git rev-parse HEAD~1 >commit-id-base &&
--
2.24.0.578.g4820254054
next prev parent reply other threads:[~2019-12-04 7:48 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-26 20:50 Bug with "git rebase" when format.useAutoBase is set Christian Biesinger
2019-11-27 2:09 ` [PATCH 0/5] rebase: fix breakage with `format.useAutoBase` Denton Liu
2019-11-27 2:09 ` [PATCH 1/5] t3400: demonstrate failure with format.useAutoBase Denton Liu
2019-11-27 2:26 ` Eric Sunshine
2019-11-30 17:25 ` Junio C Hamano
2019-11-27 2:09 ` [PATCH 2/5] format-patch: fix indentation Denton Liu
2019-11-27 2:09 ` [PATCH 3/5] t4014: use `test_config` Denton Liu
2019-11-27 2:09 ` [PATCH 4/5] format-patch: teach --no-base Denton Liu
2019-11-27 2:09 ` [PATCH 5/5] rebase: fix `format.useAutoBase` breakage Denton Liu
2019-11-27 2:42 ` Eric Sunshine
2019-11-27 17:14 ` [PATCH 0/5] rebase: fix breakage with `format.useAutoBase` Christian Biesinger
2019-11-27 18:13 ` [PATCH v2 " Denton Liu
2019-11-27 18:13 ` [PATCH v2 1/5] t3400: demonstrate failure with format.useAutoBase Denton Liu
2019-11-27 18:13 ` [PATCH v2 2/5] format-patch: fix indentation Denton Liu
2019-11-27 18:13 ` [PATCH v2 3/5] t4014: use test_config() Denton Liu
2019-11-27 18:13 ` [PATCH v2 4/5] format-patch: teach --no-base Denton Liu
2019-11-27 19:56 ` Denton Liu
2019-11-27 18:13 ` [PATCH v2 5/5] rebase: fix format.useAutoBase breakage Denton Liu
2019-12-04 16:21 ` Christian Biesinger
2019-12-04 7:47 ` [PATCH v3 0/5] rebase: fix breakage with `format.useAutoBase` Denton Liu
2019-12-04 7:47 ` [PATCH v3 1/5] t3400: demonstrate failure with format.useAutoBase Denton Liu
2019-12-04 7:47 ` [PATCH v3 2/5] format-patch: fix indentation Denton Liu
2019-12-04 7:47 ` Denton Liu [this message]
2019-12-04 7:47 ` [PATCH v3 4/5] format-patch: teach --no-base Denton Liu
2019-12-04 10:36 ` René Scharfe
2019-12-04 17:26 ` Junio C Hamano
2019-12-04 7:48 ` [PATCH v3 5/5] rebase: fix format.useAutoBase breakage Denton Liu
2019-12-04 21:24 ` [PATCH v4 0/5] rebase: fix breakage with `format.useAutoBase` Denton Liu
2019-12-04 21:24 ` [PATCH v4 1/5] t3400: demonstrate failure with format.useAutoBase Denton Liu
2019-12-04 21:24 ` [PATCH v4 2/5] format-patch: fix indentation Denton Liu
2019-12-04 21:25 ` [PATCH v4 3/5] t4014: use test_config() Denton Liu
2019-12-04 21:25 ` [PATCH v4 4/5] format-patch: teach --no-base Denton Liu
2019-12-04 21:25 ` [PATCH v4 5/5] rebase: fix format.useAutoBase breakage Denton Liu
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=638c4add00657daa9b7a4fa50882053335d5caef.1575445583.git.liu.denton@gmail.com \
--to=liu.denton@gmail.com \
--cc=cbiesinger@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.com \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.