From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Lin Sun" <lin.sun@zoom.us>,
"Đoàn Trần Công Danh" <congdanhqx@gmail.com>,
"David Aguilar" <davvid@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 2/5] config tests: test for --bool-or-str
Date: Thu, 8 Apr 2021 15:34:26 +0200 [thread overview]
Message-ID: <patch-2.6-2f6c2de050-20210408T133125Z-avarab@gmail.com> (raw)
In-Reply-To: <cover-0.6-0000000000-20210408T133125Z-avarab@gmail.com>
Add the missing tests for the --bool-or-str code added in
dbd8c09bfe (mergetool: allow auto-merge for meld to follow the
vim-diff behavior, 2020-05-07).
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
t/t1300-config.sh | 72 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 72 insertions(+)
diff --git a/t/t1300-config.sh b/t/t1300-config.sh
index e0dd5d65ce..a002ec5644 100755
--- a/t/t1300-config.sh
+++ b/t/t1300-config.sh
@@ -802,6 +802,78 @@ test_expect_success 'get --bool-or-int' '
test_cmp expect actual
'
+test_expect_success 'get --bool-or-str' '
+ cat >.git/config <<-\EOF &&
+ [bool]
+ true1
+ true2 = true
+ true3 = TRUE
+ true4 = yes
+ true5 = YES
+ true6 = on
+ true7 = ON
+ false1 =
+ false2 = false
+ false3 = FALSE
+ false4 = no
+ false5 = NO
+ false6 = off
+ false7 = OFF
+ [int]
+ int1 = 0
+ int2 = 1
+ int3 = -1
+ [string]
+ string1 = hello
+ string2 = there you
+ EOF
+ cat >expect <<-\EOF &&
+ true
+ true
+ true
+ true
+ true
+ true
+ true
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ false
+ true
+ true
+ hello
+ there you
+ EOF
+ {
+ git config --type=bool-or-str bool.true1 &&
+ git config --bool-or-str bool.true2 &&
+ git config --bool-or-str bool.true3 &&
+ git config --bool-or-str bool.true4 &&
+ git config --bool-or-str bool.true5 &&
+ git config --bool-or-str bool.true6 &&
+ git config --bool-or-str bool.true7 &&
+ git config --bool-or-str bool.false1 &&
+ git config --bool-or-str bool.false2 &&
+ git config --bool-or-str bool.false3 &&
+ git config --bool-or-str bool.false4 &&
+ git config --bool-or-str bool.false5 &&
+ git config --bool-or-str bool.false6 &&
+ git config --bool-or-str bool.false6 &&
+ git config --bool-or-str bool.false7 &&
+ git config --bool-or-str int.int1 &&
+ git config --bool-or-str int.int2 &&
+ git config --bool-or-str int.int3 &&
+ git config --bool-or-str string.string1 &&
+ git config --bool-or-str string.string2
+ } >actual &&
+ test_cmp expect actual
+'
+
cat >expect <<\EOF
[bool]
true1 = true
--
2.31.1.527.g9b8f7de2547
next prev parent reply other threads:[~2021-04-08 13:34 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-08 13:34 [PATCH 0/5] config: support --type=bool-or-auto for "tristate" parsing Ævar Arnfjörð Bjarmason
2021-04-08 13:34 ` [PATCH 1/5] config.c: add a comment about why value=NULL is true Ævar Arnfjörð Bjarmason
2021-04-08 18:10 ` Junio C Hamano
2021-04-08 13:34 ` Ævar Arnfjörð Bjarmason [this message]
2021-04-08 18:21 ` [PATCH 2/5] config tests: test for --bool-or-str Junio C Hamano
2021-04-08 23:11 ` Ævar Arnfjörð Bjarmason
2021-04-08 13:34 ` [PATCH 3/5] git-config: document --bool-or-str and --type=bool-or-str Ævar Arnfjörð Bjarmason
2021-04-08 18:22 ` Junio C Hamano
2021-04-08 13:34 ` [PATCH 4/5] config.c: add a "tristate" helper Ævar Arnfjörð Bjarmason
2021-04-08 18:33 ` Junio C Hamano
2021-04-08 23:23 ` Ævar Arnfjörð Bjarmason
2021-04-08 23:51 ` Junio C Hamano
2021-04-09 1:33 ` Ævar Arnfjörð Bjarmason
2021-04-09 12:53 ` Junio C Hamano
2021-04-08 23:54 ` Junio C Hamano
2021-04-09 20:05 ` Jeff King
2021-04-09 22:11 ` Junio C Hamano
2021-04-10 1:23 ` Jeff King
2021-04-10 1:43 ` Junio C Hamano
2021-04-08 13:34 ` [PATCH 5/5] config: add --type=bool-or-auto switch Ævar Arnfjörð Bjarmason
2021-04-08 18:36 ` Junio C Hamano
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=patch-2.6-2f6c2de050-20210408T133125Z-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=congdanhqx@gmail.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=lin.sun@zoom.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).