Re: [PATCH] t3200: clean side effect of git checkout --orphan

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Aug 30, 2020, 05:35 UTC
Message-ID: <CAPig+cQeYz9Mh+26YshuCQSzXCCUyKNGGr1wJ3FNNLpf=9QRuw@mail.gmail.com>
In-Reply-To: <20200829225648.11971-1-alipman88@gmail.com>

On Sat, Aug 29, 2020 at 6:57 PM Aaron Lipman <alipman88@gmail.com> wrote:

Show 7 quoted lines

> The "refuse --edit-description on unborn branch for now" test in t3200
> switches to an orphan branch, causing subsequent git commands
> referencing HEAD to fail. Avoid this side-effect by switching back to
> master after that test finishes.
>
> This has gone undetected, as the next effected test expects failure -
> but it currently fails for the wrong reason.

s/effected/affected

In fact, the three tests following the orphan test all expect failure (though I didn't check if they also fail for the wrong reason), and the following test which doesn't expect failure has an explicit "git checkout master" early on, which explains why it was not impacted by this problem.

Show 10 quoted lines

> Verbose output of the next test referencing HEAD,
> "--merged is incompatible with --no-merged":
>
>   fatal: malformed object name HEAD
>
> Which this commit corrects to:
>
>   error: option `no-merged' is incompatible with --merged
>
> Signed-off-by: Aaron Lipman <alipman88@gmail.com>

Description and actual fix make perfect sense.