Re: [PATCH 1/2] merge: only apply autostash when appropriate

From: Elijah Newren <newren@gmail.com>
Date: Aug 21, 2022, 05:18 UTC
Message-ID: <CABPp-BGYbdjXNXPp9rW02Ay72CWVkHKdpSDCs8V9aQA8Tu68Gg@mail.gmail.com>
In-Reply-To: <CAPig+cTMxj14gYGXgE3LAPFQRdDYXiH=Fd_iCwzoJp9uS1jCzg@mail.gmail.com>

On Sat, Aug 20, 2022 at 9:53 PM Eric Sunshine <sunshine@sunshineco.com> wrote:

Show 19 quoted lines

>
> On Sun, Aug 21, 2022 at 12:41 AM Elijah Newren via GitGitGadget
> <gitgitgadget@gmail.com> wrote:
> > If a merge failed and we are leaving conflicts in the working directory
> > for the user to resolve, we should not attempt to apply any autostash.
> >
> > Further, if we fail to apply the autostash (because either the merge
> > failed, or the user requested --no-commit), then we should instruct the
> > user how to apply it later.
> >
> > Add a testcase verifying we have corrected this behavior.
> >
> > Signed-off-by: Elijah Newren <newren@gmail.com>
> > ---
> > diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
> > @@ -255,6 +255,15 @@ test_expect_success 'merge --squash c3 with c7' '
> > +test_expect_success 'merge --squash --autostash conflict does not attempt to play autostash' '
>
> Did you mean s/play/apply/ ?

Yep; will fix.