diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-10-15 13:48:03 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-15 13:48:03 +0900 |
| commit | 1ef3bd362a3bc4d43d0d07936aaddc8c72dfe33d (patch) | |
| tree | 21d607811a55fb8e6011d1db7c3adac0a9850bd2 | |
| parent | Merge branch 'js/xdiffi-comment-updates' (diff) | |
| parent | t4014: treat rev-list output as the expected value (diff) | |
| download | tgif-1ef3bd362a3bc4d43d0d07936aaddc8c72dfe33d.tar.xz | |
Merge branch 'dl/format-patch-doc-test-cleanup'
test cleanup.
* dl/format-patch-doc-test-cleanup:
t4014: treat rev-list output as the expected value
| -rwxr-xr-x | t/t4014-format-patch.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 83f52614d3..72b09896cf 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -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' ' |