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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

On Thu, 21 Jan 2021 at 20:51, Christian Couder
<christian.couder@xxxxxxxxx> wrote:
[...]
> > > > +     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



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux