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

diff --git a/t/t5536-fetch-conflicts.sh b/t/t5536-fetch-conflicts.sh
index 679c53e044fad7a2651124eabc0620c2c94c7546..91f28c2f783df7391d22bd893e2488e56658515b 100755 (executable)
--- a/t/t5536-fetch-conflicts.sh
+++ b/t/t5536-fetch-conflicts.sh
@@ -18,14 +18,6 @@ setup_repository () {
        )
 }
 
-verify_stderr () {
-       cat >expected &&
-       # We're not interested in the error
-       # "fatal: The remote end hung up unexpectedly":
-       grep -v "hung up" <error >actual &&
-       test_cmp expected actual
-}
-
 test_expect_success 'setup' '
        git commit --allow-empty -m "Initial" &&
        git branch branch1 &&
@@ -48,9 +40,7 @@ test_expect_success 'fetch conflict: config vs. config' '
                "+refs/heads/branch2:refs/remotes/origin/branch1" && (
                cd ccc &&
                test_must_fail git fetch origin 2>error &&
-               verify_stderr <<-\EOF
-               fatal: refs/remotes/origin/branch1 tracks both refs/heads/branch1 and refs/heads/branch2
-               EOF
+               test_i18ngrep "fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1" error
        )
 '
 
@@ -77,19 +67,19 @@ test_expect_success 'fetch conflict: arg vs. arg' '
                test_must_fail git fetch origin \
                        refs/heads/*:refs/remotes/origin/* \
                        refs/heads/branch2:refs/remotes/origin/branch1 2>error &&
-               verify_stderr <<-\EOF
-               fatal: refs/remotes/origin/branch1 tracks both refs/heads/branch1 and refs/heads/branch2
-               EOF
+               test_i18ngrep "fatal: Cannot fetch both refs/heads/branch1 and refs/heads/branch2 to refs/remotes/origin/branch1" error
        )
 '
 
-test_expect_failure 'fetch conflict: criss-cross args' '
+test_expect_success 'fetch conflict: criss-cross args' '
        setup_repository xaa \
                "+refs/heads/*:refs/remotes/origin/*" && (
                cd xaa &&
                git fetch origin \
                        refs/heads/branch1:refs/remotes/origin/branch2 \
-                       refs/heads/branch2:refs/remotes/origin/branch1
+                       refs/heads/branch2:refs/remotes/origin/branch1 2>error &&
+               test_i18ngrep "warning: refs/remotes/origin/branch1 usually tracks refs/heads/branch1, not refs/heads/branch2" error &&
+               test_i18ngrep "warning: refs/remotes/origin/branch2 usually tracks refs/heads/branch2, not refs/heads/branch1" error
        )
 '