summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-10-15 04:48:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-10-15 04:48:03 (GMT)
commit1ef3bd362a3bc4d43d0d07936aaddc8c72dfe33d (patch)
tree21d607811a55fb8e6011d1db7c3adac0a9850bd2
parenteb3de5b823faad600e4b4c5327a96b4269ad13db (diff)
parent756fb0dedb72e8eec691d216198ccc23102d7072 (diff)
downloadgit-1ef3bd362a3bc4d43d0d07936aaddc8c72dfe33d.zip
git-1ef3bd362a3bc4d43d0d07936aaddc8c72dfe33d.tar.gz
git-1ef3bd362a3bc4d43d0d07936aaddc8c72dfe33d.tar.bz2
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-xt/t4014-format-patch.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 83f5261..72b0989 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' '