From: Jiang Xin <worldhello.net@gmail.com>
Date: Wed, 12 Jan 2022 06:31:33 GMT
Subject: Re: [PATCH v7 8/8] branch: protect branches checked out in all worktrees
Message-ID: <CANYiYbGdUE_NQFTA31EnEr57E00umfJQoUPMc=OZ3snO+GWZ=w@mail.gmail.com>
In-Reply-To: <CANYiYbHBjM-1oezX_1Z+te+wvQpdj=rwggHHCLPepos_Njwqvw@mail.gmail.com>

On Thu, Dec 23, 2021 at 8:58 AM Jiang Xin <worldhello.net@gmail.com> wrote:
>
> On Thu, Dec 2, 2021 at 6:16 AM Anders Kaseorg <andersk@mit.edu> wrote:
> > +       if (wt && !wt->is_bare)
> > +               die(_("cannot force update the branch '%s'"
> > +                     "checked out at '%s'"),
>
> There is no space between "'%s'" and "checkout". Found this from [1],
> sorry for reporting this is a bit late.
>
> [1] https://github.com/git-l10n/git-po/blob/pot/master/2021-12-22.diff#L315

This issue was still there in git v2.35.0-rc0. Peter Krefting and Emir
SARI also reported this issue in pull requests:

 * https://github.com/git-l10n/git-po/pull/599
 * https://github.com/git-l10n/git-po/pull/600

I see Bagas has sent a patch for this:

 * https://lore.kernel.org/git/20220111123627.58625-1-bagasdotme@gmail.com/

--
Jiang Xin