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

From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Apr 25, 2021, 00:04 UTC
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:

Show 6 quoted lines

> 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

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.