Merge branch 'maint-2.5' into maint-2.6

diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 66dd28644f954eb91b5f05d5c6f00a8697c4d274..52678e7d0ac754bb678eb7c7a9203bc253085366 100755 (executable)
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -352,6 +352,18 @@ test_expect_success '--list without repo produces empty output' '
        test_cmp expect output
 '
 
+cat > expect << EOF
+beta.noindent
+nextsection.nonewline
+123456.a123
+version.1.2.3eX.alpha
+EOF
+
+test_expect_success '--name-only --list' '
+       git config --name-only --list >output &&
+       test_cmp expect output
+'
+
 cat > expect << EOF
 beta.noindent sillyValue
 nextsection.nonewline wow2 for me
@@ -362,6 +374,16 @@ test_expect_success '--get-regexp' '
        test_cmp expect output
 '
 
+cat > expect << EOF
+beta.noindent
+nextsection.nonewline
+EOF
+
+test_expect_success '--name-only --get-regexp' '
+       git config --name-only --get-regexp in >output &&
+       test_cmp expect output
+'
+
 cat > expect << EOF
 wow2 for me
 wow4 for you