pretty: add support for separator option in %(trailers)

diff --git a/t/t0012-help.sh b/t/t0012-help.sh
index 060df24c2d99f433b0aa24288b93b108255a0afa..e8ef7300ecb8693367906d4c314797e5750bdf50 100755 (executable)
--- a/t/t0012-help.sh
+++ b/t/t0012-help.sh
@@ -29,9 +29,9 @@ test_expect_success "setup" '
 # to verify
 test_expect_success 'basic help commands' '
        git help >/dev/null &&
-       git help -a >/dev/null &&
+       git help -a --no-verbose >/dev/null &&
        git help -g >/dev/null &&
-       git help -av >/dev/null
+       git help -a >/dev/null
 '
 
 test_expect_success "works for commands and guides by default" '
@@ -66,6 +66,12 @@ test_expect_success 'git help' '
        test_i18ngrep "^   commit " help.output &&
        test_i18ngrep "^   fetch  " help.output
 '
+test_expect_success 'git help -g' '
+       git help -g >help.output &&
+       test_i18ngrep "^   attributes " help.output &&
+       test_i18ngrep "^   everyday   " help.output &&
+       test_i18ngrep "^   tutorial   " help.output
+'
 
 test_expect_success 'generate builtin list' '
        git --list-cmds=builtins >builtins