[6/8] builtin/config: canonicalize "value_regex" with `--type=bool-or-int`

Commit Message

Martin Ågren Nov. 13, 2019, 6:55 p.m. UTC

As an obvious follow-up to the previous commit, also canonicalize the
"value_regex" when the type is "bool-or-int".

Observe that in this case, falling back to handling the "value_regex" as
a normal regex is not just to cater to old scripts and habits. It is
necessary to handle the numerical inputs (or regexes matching some
specific numerical values!) that we must expect.

Future commits will expand on the code for `--type=bool`. Rather than
trying to shoehorn both these cases into a single chunk of code, let's
just duplicate some of the code from the previous commit.

Signed-off-by: Martin Ågren <[e-mail]>
---
 Documentation/git-config.txt |  2 +-
 builtin/config.c             |  9 +++++++++
 t/t1300-config.sh            | 20 ++++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

Patch

diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 139750bbda..864375b1ec 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -43,7 +43,7 @@  outgoing values are canonicalize-able under the given <type>.  If no
 `--type=<type>` is given, no canonicalization will be performed. Callers may
 unset an existing `--type` specifier with `--no-type`.
 
-With `--type=bool`, if `value_regex` is given
+With `--type=bool` or `--type=bool-or-int`, if `value_regex` is given
 and canonicalizes to a boolean value, it matches all entries
 that canonicalize to the same boolean value.
 
diff --git a/builtin/config.c b/builtin/config.c
index c9fe0c5752..4e274d4867 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -305,6 +305,15 @@  static int handle_value_regex(const char *regex_)
 		}
 	}
 
+	if (type == TYPE_BOOL_OR_INT) {
+		int boolval = git_parse_maybe_bool_text(regex_);
+		if (boolval >= 0) {
+			cmd_line_value.mode = boolean;
+			cmd_line_value.boolean = boolval;
+			return 0;
+		}
+	}
+
 	cmd_line_value.mode = regexp;
 
 	if (regex_[0] == '!') {
diff --git a/t/t1300-config.sh b/t/t1300-config.sh
index e4906a893e..f0e9a21dc4 100755
--- a/t/t1300-config.sh
+++ b/t/t1300-config.sh
@@ -472,6 +472,26 @@  test_expect_success '--type=bool with "non-bool" value_regex' '
 	test_must_be_empty output
 '
 
+test_expect_success '--type=bool-or-int with boolean value_regex' '
+	echo true >expect &&
+	git config --type=bool-or-int --get foo.y2 true >output &&
+	test_cmp expect output
+'
+
+test_expect_success '--type=bool-or-int with integer value_regex' '
+	test_must_fail git config --type=bool-or-int --get foo.y2 1 >output &&
+	test_must_be_empty output &&
+	echo 1 >expect &&
+	git config --type=bool-or-int --get foo.y5 1 >output &&
+	test_cmp expect output
+'
+
+test_expect_success '--type=bool-or-int with regex value_regex' '
+	echo true >expect &&
+	git config --type=bool-or-int --get foo.y4 "t.*" >output &&
+	test_cmp expect output
+'
+
 test_expect_success 'setup simple config file' '
 	q_to_tab >.git/config <<-\EOF
 	[a.b]