Merge branch 'dl/use-sq-from-test-lib'

diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh
index da113d975b160f3c34a4acda3d82a26d65f5268e..cfb74d0e03541e136c46e7c84a7e537e19dc1509 100755 (executable)
--- a/t/t6006-rev-list-format.sh
+++ b/t/t6006-rev-list-format.sh
@@ -501,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 &&