Merge branch 'jn/shortlog' into maint

diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh
index 313897bbc0bb499dc854975437fb5dc33e0844dc..e8fde5c19c16f3fa2305ed319edb3289f4f758b9 100755 (executable)
--- a/t/t6006-rev-list-format.sh
+++ b/t/t6006-rev-list-format.sh
@@ -244,7 +244,7 @@ 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 rev-list --oneline HEAD > /tmp/test.txt &&
+       git rev-list --oneline HEAD >test.txt &&
        test $(git rev-list --oneline HEAD | wc -l) -eq 5 &&
        test $(git rev-list --oneline --graph HEAD | wc -l) -eq 5
 '