Re: [PATCH v2 3/9] rebase -i: comment out squash!/fixup! subjects from squash message

From: Charvi Mendiratta <charvi077@gmail.com>
Date: Jan 22, 2021, 19:41 UTC
Message-ID: <CAPSFM5eOEQFDAhTateUOJt5XHY8dG8QtfjcXc-XEEZtmPmiG0g@mail.gmail.com>
In-Reply-To: <CAP8UFD3PRaiCiSfSMaX0FDrEcOz2xv3992meum7qnKve1rK6nw@mail.gmail.com>

Hi,

On Thu, 21 Jan 2021 at 20:51, Christian Couder <christian.couder@gmail.com> wrote: [...]

Show 22 quoted lines

> > > > +     grep "extra para" commit >actual &&
> > >
> > > I can tell that you want the "extra para" to still remain, but how
> > > does the grep that is not anchored guarantee that?
> >
> > .. but now I think to remove this `grep -v "squash" commit` as also
> > discussed with Phillip earlier that in this test script we are not
> > checking for the commented commit message.
> >
> > > Perhaps look for
> > >
> > >         grep "^extra para" commit
> > >
> > > to ensure that you are not seeing a commented out but somehow failed
> > > to get stripspaced out?
> > >
> > I am not sure, what does failing to get stripspaced mean?
>
> I think this refers to:
>
> https://git-scm.com/docs/git-stripspace
>

Okay, thanks for referring and also here in this test script - so that the test does not fail due to stripspace, it is using the `test_line_count` function. Also I agree with above so maybe it is right to just replace with:

grep "^extra para" commit && grep "extra para" commit >actual &&

Thanks and Regards, Charvi