From: Jiang Xin <worldhello.net@gmail.com>
To: Anders Kaseorg <andersk@mit.edu>, Junio C Hamano <gitster@pobox.com>
Cc: "Git List" <git@vger.kernel.org>,
"Alexander Shopov" <ash@kambanaria.org>,
"Jordi Mas" <jmas@softcatala.org>,
"Matthias Rüster" <matthias.ruester@gmail.com>,
"Jimmy Angelakos" <vyruss@hellug.gr>,
"Christopher Díaz" <christopher.diaz.riv@gmail.com>,
"Jean-Noël Avila" <jn.avila@free.fr>,
"Bagas Sanjaya" <bagasdotme@gmail.com>,
"Alessandro Menti" <alessandro.menti@alessandromenti.it>,
"Gwan-gyeong Mun" <elongbug@gmail.com>, Arusekk <arek_koz@o2.pl>,
"Daniel Santos" <daniel@brilhante.top>,
"Dimitriy Ryazantcev" <DJm00n@mail.ru>,
"Peter Krefting" <peter@softwolves.pp.se>,
"Emir SARI" <bitigchi@me.com>,
"Trần Ngọc Quân" <vnwildman@gmail.com>,
"Fangyi Zhou" <me@fangyi.io>, "Yi-Jyun Pan" <pan93412@gmail.com>
Subject: Re: [PATCH v7 8/8] branch: protect branches checked out in all worktrees
Date: Wed, 12 Jan 2022 14:31:33 +0800 [thread overview]
Message-ID: <CANYiYbGdUE_NQFTA31EnEr57E00umfJQoUPMc=OZ3snO+GWZ=w@mail.gmail.com> (raw)
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
next prev parent reply other threads:[~2022-01-12 6:32 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-01 22:15 [PATCH v7 0/8] protect branches checked out in all worktrees Anders Kaseorg
2021-12-01 22:15 ` [PATCH v7 1/8] fetch: lowercase error messages Anders Kaseorg
2021-12-01 22:15 ` [PATCH v7 2/8] receive-pack: " Anders Kaseorg
2021-12-01 22:15 ` [PATCH v7 3/8] branch: " Anders Kaseorg
2021-12-01 22:15 ` [PATCH v7 4/8] worktree: simplify find_shared_symref() memory ownership model Anders Kaseorg
2021-12-01 23:10 ` Eric Sunshine
2021-12-01 23:47 ` Anders Kaseorg
2021-12-02 0:13 ` Eric Sunshine
2021-12-02 0:32 ` Eric Sunshine
2021-12-02 9:06 ` Anders Kaseorg
2021-12-02 21:00 ` Eric Sunshine
2021-12-01 22:15 ` [PATCH v7 5/8] fetch: protect branches checked out in all worktrees Anders Kaseorg
2021-12-02 2:51 ` Eric Sunshine
2021-12-02 8:37 ` Anders Kaseorg
2021-12-01 22:15 ` [PATCH v7 6/8] receive-pack: clean dead code from update_worktree() Anders Kaseorg
2021-12-01 22:15 ` [PATCH v7 7/8] receive-pack: protect current branch for bare repository worktree Anders Kaseorg
2021-12-01 22:15 ` [PATCH v7 8/8] branch: protect branches checked out in all worktrees Anders Kaseorg
2021-12-23 0:58 ` Jiang Xin
2022-01-12 6:31 ` Jiang Xin [this message]
2022-01-12 19:10 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CANYiYbGdUE_NQFTA31EnEr57E00umfJQoUPMc=OZ3snO+GWZ=w@mail.gmail.com' \
--to=worldhello.net@gmail.com \
--cc=DJm00n@mail.ru \
--cc=alessandro.menti@alessandromenti.it \
--cc=andersk@mit.edu \
--cc=arek_koz@o2.pl \
--cc=ash@kambanaria.org \
--cc=bagasdotme@gmail.com \
--cc=bitigchi@me.com \
--cc=christopher.diaz.riv@gmail.com \
--cc=daniel@brilhante.top \
--cc=elongbug@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jmas@softcatala.org \
--cc=jn.avila@free.fr \
--cc=matthias.ruester@gmail.com \
--cc=me@fangyi.io \
--cc=pan93412@gmail.com \
--cc=peter@softwolves.pp.se \
--cc=vnwildman@gmail.com \
--cc=vyruss@hellug.gr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).