Re: [PATCH v2 7/8] merge-tree: support saving merge messages to a separate file

From: Elijah Newren <newren@gmail.com>
Date: Jan 8, 2022, 01:02 UTC
Message-ID: <CABPp-BFQTTakkeDkwbiq41ie++dKeje3nGKWMp1Gm-YmvrevJA@mail.gmail.com>
In-Reply-To: <nycvar.QRO.7.76.6.2201071906050.339@tvgsbejvaqbjf.bet>

On Fri, Jan 7, 2022 at 10:07 AM Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

Show 18 quoted lines

>
> Hi Elijah,
>
> On Wed, 5 Jan 2022, Elijah Newren via GitGitGadget wrote:
>
> > diff --git a/t/t4301-merge-tree-real.sh b/t/t4301-merge-tree-real.sh
> > index f7aa310f8c1..5f3f27f504d 100755
> > --- a/t/t4301-merge-tree-real.sh
> > +++ b/t/t4301-merge-tree-real.sh
> > @@ -78,4 +78,22 @@ test_expect_success 'Barf on too many arguments' '
> >       grep "^usage: git merge-tree" expect
> >  '
> >
> > +test_expect_success '--messages gives us the conflict notices and such' '
> > +     test_must_fail git merge-tree --real --messages=MSG_FILE side1 side2 &&
>
> Since we discern between exit status 1 (= merge conflict) and >1 (fatal
> error), we should probably use `test_expect_code` here.

Good point; will do.