Re: [PATCH v3 5/7] merge: make restore_state() restore staged state too

From: Elijah Newren <newren@gmail.com>
Date: Jul 21, 2022, 19:52 UTC
Message-ID: <CABPp-BG5Dvoft_RhSz5PicGJyL3-j2PDqoxF4+cfH3k3NhVz4g@mail.gmail.com>
In-Reply-To: <xmqq8roml9h6.fsf@gitster.g>

On Thu, Jul 21, 2022 at 9:24 AM Junio C Hamano <gitster@pobox.com> wrote:

Show 12 quoted lines

>
> "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
> >    * stash the changes, in order to clean up after the strategies
> >    * try all the merge strategies in turn, each of which report they
> >      cannot function due to the index not matching HEAD
> >    * restore the changes via "git stash apply"
>
> A tangent that does not make much difference in the end, but I am
> finding these lines curious and somewhat annoying.  Why do we have
> &nbsp; sandwitching the plain whitespace only on lines that begin
> with an asterisk?

Eek! That's nasty. I was switching back and forth between responding to emails and coding up fixes, and copy-pasted part of my email into the commit message. So, apparently gmail hates me, and I just didn't notice.

I'll clean these up; I'm rerolling for the "error()" cleanup you mentioned anyway.