Merge branch 'jh/trace2-pretty-output'

diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh
index ec42c2f7797c38f39bb3420402d975a94217d1f4..cfb74d0e03541e136c46e7c84a7e537e19dc1509 100755 (executable)
--- a/t/t6006-rev-list-format.sh
+++ b/t/t6006-rev-list-format.sh
@@ -185,6 +185,10 @@ test_expect_success 'basic colors' '
        test_cmp expect actual
 '
 
+test_expect_success '%S is not a placeholder for rev-list yet' '
+       git rev-list --format="%S" -1 master | grep "%S"
+'
+
 test_expect_success 'advanced colors' '
        cat >expect <<-EOF &&
        commit $head2
@@ -497,9 +501,8 @@ test_expect_success 'reflog identity' '
 '
 
 test_expect_success 'oneline with empty message' '
-       git commit -m "dummy" --allow-empty &&
-       git commit -m "dummy" --allow-empty &&
-       git filter-branch --msg-filter "sed -e s/dummy//" HEAD^^.. &&
+       git commit --allow-empty --cleanup=verbatim -m "$LF" &&
+       git commit --allow-empty --allow-empty-message &&
        git rev-list --oneline HEAD >test.txt &&
        test_line_count = 5 test.txt &&
        git rev-list --oneline --graph HEAD >testg.txt &&