On Sun, Mar 17 2019, Jonathan Chang wrote: > Signed-off-by: Jonathan Chang <ttjtftx@xxxxxxxxx> > --- > t/t0000-basic.sh | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh > index 47666b013e..3de13daabe 100755 > --- a/t/t0000-basic.sh > +++ b/t/t0000-basic.sh > @@ -1136,8 +1136,8 @@ test_expect_success 'git commit-tree omits duplicated parent in a commit' ' > parent=$(sed -n -e "s/^parent //p" -e "/^author /q" actual | sort -u) && > test "z$commit0" = "z$parent" && > git show --pretty=raw $commit2 >actual && > - numparent=$(sed -n -e "s/^parent //p" -e "/^author /q" actual | wc -l) && > - test $numparent = 1 > + sed -n -e "s/^parent //p" -e "/^author /q" actual >parents && > + test_line_count = 1 parents > ' > > test_expect_success 'update-index D/F conflict' ' > @@ -1146,8 +1146,7 @@ test_expect_success 'update-index D/F conflict' ' > mv tmp path2 && > git update-index --add --replace path2 path0/file2 && > git ls-files path0 >actual && > - numpath0=$(wc -l <actual) && > - test $numpath0 = 1 > + test_line_count = 1 actual > ' ...of course reading this series in sequence I find that 50% of my suggestions for 2/3 are then done in this patch... :)
