Subject: Re: [PATCH 27/30] subtree: allow --squash to be used with --rejoin

From: Luke Shumaker <[email-masked]>
Date: Sat, 24 Apr 2021 18:04:07 -0600

On Fri, 23 Apr 2021 23:50:08 -0600,
Eric Sunshine wrote:
> On Fri, Apr 23, 2021 at 3:43 PM Luke Shumaker <[email-masked]> 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