undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t6050: use test_line_count instead of wc -l

Browse Source 
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>
This commit is contained in:
Christian Couder 2019-03-31 15:46:56 +02:00 committed by Junio C Hamano
parent aeb582a983
commit 502d87b9e3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
t/t6050-replace.sh
View File

@ -393,9 +393,11 @@ test_expect_success 'replace ref cleanup' '
' '
test_expect_success '--graft with and without already replaced object' ' 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 && git replace --graft $HASH5 &&
test $(git log --oneline | wc -l) = 3 && git log --oneline >log &&
test_line_count = 3 log &&
commit_has_parents $HASH5 && commit_has_parents $HASH5 &&
test_must_fail git replace --graft $HASH5 $HASH4 $HASH3 && test_must_fail git replace --graft $HASH5 $HASH4 $HASH3 &&
git replace --force -g $HASH5 $HASH4 $HASH3 && git replace --force -g $HASH5 $HASH4 $HASH3 &&