On Thu, Oct 22, 2020 at 1:56 AM Junio C Hamano <gitster@xxxxxxxxx> wrote: > Subject: t7102: prepare expected output inside test_expect_* block > > Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> > --- > diff --git c/t/t7102-reset.sh w/t/t7102-reset.sh > @@ -82,15 +82,15 @@ test_expect_success 'reset --hard message (ISO8859-1 logoutputencoding)' ' > ->.diff_expect > ->.cached_expect > -cat >.cat_expect <<EOF > -secondfile: > -EOF > - > test_expect_success 'giving a non existing revision should fail' ' > + >.diff_expect && > + >.cached_expect && > + cat >.cat_expect <<-\EOF && > + secondfile: > + EOF You used <<-\EOF rather than plain <<-EOF when possible. Good. (Might be worth mention in the commit message, but perhaps too minor?) > @@ -191,38 +191,38 @@ test_expect_success 'resetting to HEAD with no changes should succeed and do not > test_expect_success '--soft reset only should show changes in diff --cached' ' > + >.diff_expect && > + cat >.cached_expect <<-EOF && > + diff --git a/secondfile b/secondfile > + index $head5p1s..$head5s 100644 And used plain <<-EOF when necessary. Fine.