Merge branch 'jk/more-comments-on-textconv' into maint

diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index 4a14a5892e9ac06c967e17a4db68e57b06313c18..2ba62fbc178e1c92dff493beebdc9683b36efd2a 100755 (executable)
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -370,6 +370,40 @@ test_expect_success '__git_remotes - list remotes from $GIT_DIR/remotes and from
        test_cmp expect actual
 '
 
+test_expect_success '__git_get_config_variables' '
+       cat >expect <<-EOF &&
+       name-1
+       name-2
+       EOF
+       test_config interesting.name-1 good &&
+       test_config interesting.name-2 good &&
+       test_config subsection.interesting.name-3 bad &&
+       __git_get_config_variables interesting >actual &&
+       test_cmp expect actual
+'
+
+test_expect_success '__git_pretty_aliases' '
+       cat >expect <<-EOF &&
+       author
+       hash
+       EOF
+       test_config pretty.author "%an %ae" &&
+       test_config pretty.hash %H &&
+       __git_pretty_aliases >actual &&
+       test_cmp expect actual
+'
+
+test_expect_success '__git_aliases' '
+       cat >expect <<-EOF &&
+       ci
+       co
+       EOF
+       test_config alias.ci commit &&
+       test_config alias.co checkout &&
+       __git_aliases >actual &&
+       test_cmp expect actual
+'
+
 test_expect_success 'basic' '
        run_completion "git " &&
        # built-in