On 2021-06-12 23:39:51-0400, Eric Sunshine <sunshine@xxxxxxxxxxxxxx> wrote: > On Sat, Jun 12, 2021 at 12:28 AM Đoàn Trần Công Danh > <congdanhqx@xxxxxxxxx> wrote: > > > > Signed-off-by: Đoàn Trần Công Danh <congdanhqx@xxxxxxxxx> > > --- > > diff --git a/t/t6400-merge-df.sh b/t/t6400-merge-df.sh > > @@ -82,13 +82,13 @@ test_expect_success 'modify/delete + directory/file conflict' ' > > - test 5 -eq $(git ls-files -s | wc -l) && > > - test 4 -eq $(git ls-files -u | wc -l) && > > + test_line_count_cmd --out = 5 git ls-files -s && > > + test_line_count_cmd --out = 4 git ls-files -u && > > Nit: too many spaces before the `&&` on the second line: s/\s+/ / Thanks, I'll update them, later. In my defence, this patch was generated mechanically with: :%s/test \([0-9]\+\) -eq "*[$][(]\(.*\)|.*[)]"*/test_line_count_cmd --out = \1 \2/gc I forgot to include the space after final ")" > > @@ -103,13 +103,13 @@ test_expect_success 'modify/delete + directory/file conflict; other way' ' > > - test 5 -eq $(git ls-files -s | wc -l) && > > - test 4 -eq $(git ls-files -u | wc -l) && > > + test_line_count_cmd --out = 5 git ls-files -s && > > + test_line_count_cmd --out = 4 git ls-files -u && > > Nit: too many spaces before the `&&` on both lines. -- Danh
