From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Sun, 25 Apr 2021 00:04:07 GMT
Subject: Re: [PATCH 27/30] subtree: allow --squash to be used with --rejoin
Message-ID: <87tunv9qmg.wl-lukeshu@lukeshu.com>
In-Reply-To: <CAPig+cTdTTq+W-QM3y60621GqqgXiHOueKF_Yk35=bL5p8o9uw@mail.gmail.com>

On Fri, 23 Apr 2021 23:50:08 -0600,
Eric Sunshine wrote:
> On Fri, Apr 23, 2021 at 3:43 PM Luke Shumaker <lukeshu@lukeshu.com> wrote:
> > +               ! git merge-base --is-ancestor $SUB HEAD &&
> > +               ! git merge-base --is-ancestor $SPLIT HEAD &&
> 
> It's preferable to use `test_must_fail` rather than `!` for Git
> commands

Indeed, this was an oversight on my part.  I'll adjust it.

-- 
Happy hacking,
~ Luke Shumaker