Re: [RFC PATCH 3/9] rebase -i: comment out squash!/fixup! subjects from squash message
- From
Charvi Mendiratta <charvi077@gmail.com>
- Date
- Jan 19, 2021, 04:08 UTC
- Message-ID
- <CAPSFM5dVbj-y=kRVhLC=9pfd3myjFP9R6-iih4CZiO3XSYO+sQ@mail.gmail.com>
- In-Reply-To
- <f2085c1b-c6aa-0183-e090-8b2da3cc57c0@gmail.com>
Hi Phillip,
On Mon, 18 Jan 2021 at 23:59, Phillip Wood <phillip.wood123@gmail.com> wrote:
Show 10 quoted lines
> [...] > > So I added to check the test as here: > > > > - grep squash commit >actual && > > + grep -v "squash" commit >actual && > > There is no need to redirect the output of this one - we don't expect > any output and the test will fail if there is so we want to see what the > output is. >
Okay,
Show 20 quoted lines
> > + grep "extra para" commit >actual && > > > >> Looking at the changes to the tests in this commit it highlights the > >> fact that I don't think we ever check exactly what the user sees in > >> their editor. We do add such a test for the new `fixup -C` functionality > >> in a later patch but perhaps we should improve the test coverage of the > >> squash message presented to the user before then. > > > > I agree and in this test it's now just checking if the commit message body of > > "squash!" i.e line "extra para", is added in commit message or not. So, I am > > doubtful if the above is the right way to test whether squash! line is commented > > out or not , as "grep "extra para" commit >actual &&" will rewrite the > > 'actual' file. > > The test above gives us reassurance that "squash! ..." does not make it > into the commit message which is important. We'd want a separate test to > check the message that is presented to the user however looking at patch > 7 the test 'sequence of fixup, fixup -C & squash --signoff works' checks > that a "squash! ..." subject line gets commented out so I wouldn't worry > about an additional test here
I agree, thanks for confirming.
Thanks and Regards, Charvi