Re: [PATCH 3/4] t7401: ensure uniformity in the '--for-status' test
- From
Shourya Shukla <shouryashukla.oo@gmail.com>
- Date
- Aug 6, 2020, 08:50 UTC
- Message-ID
- <20200806085043.GB13942@konoha>
- In-Reply-To
- <xmqq3650ok53.fsf@gitster.c.googlers.com>
On 05/08 02:30, Junio C Hamano wrote:
Show 12 quoted lines
> Shourya Shukla <shouryashukla.oo@gmail.com> writes: > > > The '--for-status' test got its expected output from stdin. This is > > inconsistent with the other tests in the test script which get their > > expected output from a file named 'expected'. > > > > So, change the syntax of the '--for-status' test for uniformity. > > There are a handful examples in t5401 and another one in t3700 that > give the "golden master" from the standard input. When the expected > output is used only once, I do not think it is particularlly bad to > have it this way. So,... meh?
I realised what you were trying to say after checking out t5400 and t3700. I understand that this change may not be immediately needed but I think it does make reading the diff a bit easier since having a '-' as a file name does get a bit confusing when reading the output. If a separeate commit just for this change is a problem then I can squash this with the previous commit? What do you think?
Show 31 quoted lines
> Unless there is a compelling reason to insist both are files > (that may make it easier to enhance test_cmp in a certain way > you plan to, for example), that is. > > > Mentored-by: Christian Couder <chriscool@tuxfamily.org> > > Mentored-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com> > > Signed-off-by: Shourya Shukla <shouryashukla.oo@gmail.com> > > --- > > t/t7401-submodule-summary.sh | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh > > index 18fefdb0ba..145914cd5a 100755 > > --- a/t/t7401-submodule-summary.sh > > +++ b/t/t7401-submodule-summary.sh > > @@ -285,13 +285,14 @@ EOF > > > > test_expect_success '--for-status' " > > git submodule summary --for-status HEAD^ >actual && > > - test_i18ncmp actual - <<EOF > > + cat >expected <<-EOF && > > * sm1 $head6...0000000: > > > > * sm2 0000000...$head7 (2): > > > Add foo9 > > > > EOF > > + test_i18ncmp expected actual > > " > > > > test_expect_success 'fail when using --files together with --cached' "