summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorChristian Couder <christian.couder@gmail.com>2019-03-31 13:46:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-04-01 08:49:00 (GMT)
commit502d87b9e3ee6faadae45d545e0e257ef8948f0b (patch)
tree0ec103fbc622f43843360380a7d6e13732403a36 /t
parentaeb582a98374c094361cba1bd756dc6307432c42 (diff)
downloadgit-502d87b9e3ee6faadae45d545e0e257ef8948f0b.zip
git-502d87b9e3ee6faadae45d545e0e257ef8948f0b.tar.gz
git-502d87b9e3ee6faadae45d545e0e257ef8948f0b.tar.bz2
t6050: use test_line_count instead of wc -l
This modernizes a test and makes it more portable. Reviewed-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t6050-replace.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index d638119..41b1779 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -393,9 +393,11 @@ test_expect_success 'replace ref cleanup' '
'
test_expect_success '--graft with and without already replaced object' '
- test $(git log --oneline | wc -l) = 7 &&
+ git log --oneline >log &&
+ test_line_count = 7 log &&
git replace --graft $HASH5 &&
- test $(git log --oneline | wc -l) = 3 &&
+ git log --oneline >log &&
+ test_line_count = 3 log &&
commit_has_parents $HASH5 &&
test_must_fail git replace --graft $HASH5 $HASH4 $HASH3 &&
git replace --force -g $HASH5 $HASH4 $HASH3 &&