In 6bd26f58ea (t4014: use test_line_count() where possible, 2019-08-27),
we converted many test cases to take advantage of the test_line_count()
function. In one conversion, we inverted the expected and actual value
as tested by test_line_count(). Although functionally correct, if
format-patch ever produced incorrect output, the debugging output would
be a bunch of hashes which would be difficult to debug.

Invert the expected and actual values provided to test_line_count() so
that if format-patch produces incorrect output, the debugging output
will be a list of human-readable files instead.

Helped-by: SZEDER Gábor <>
Signed-off-by: Denton Liu <>
Thanks for point out my mistake, Szeder. This patch can be applied to
the tip of 'dl/format-patch-doc-test-cleanup' and then we should base
Bert's changes on top of this branch.

 t/ | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/t/ b/t/
index 83f52614d3..72b09896cf 100755
--- a/t/
+++ b/t/
@@ -1610,8 +1610,9 @@ test_expect_success 'format-patch format.outputDirectory 
option' '
        test_config format.outputDirectory patches &&
        rm -fr patches &&
        git format-patch master..side &&
-       git rev-list master..side >list &&
-       test_line_count = $(ls patches | wc -l) list
+       count=$(git rev-list --count master..side) &&
+       ls patches >list &&
+       test_line_count = $count list
 test_expect_success 'format-patch -o overrides format.outputDirectory' '

Reply via email to