git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v7 8/8] branch: protect branches checked out in all worktrees

From
Jiang Xin <worldhello.net@gmail.com>
Date
Dec 23, 2021, 00:58 UTC
Message-ID
<CANYiYbHBjM-1oezX_1Z+te+wvQpdj=rwggHHCLPepos_Njwqvw@mail.gmail.com>
In-Reply-To
<20211201221547.1796213-9-andersk@mit.edu>
On Thu, Dec 2, 2021 at 6:16 AM Anders Kaseorg <andersk@mit.edu> wrote:
Show 36 quoted lines
>
> Refuse to force-move a branch over the currently checked out branch of
> any working tree, not just the current one.
>
> Signed-off-by: Anders Kaseorg <andersk@mit.edu>
> ---
>  branch.c          | 13 +++++++++----
>  t/t3200-branch.sh |  7 +++++++
>  2 files changed, 16 insertions(+), 4 deletions(-)
>
> diff --git a/branch.c b/branch.c
> index c66b222abd..2cfe496d24 100644
> --- a/branch.c
> +++ b/branch.c
> @@ -199,7 +199,8 @@ int validate_branchname(const char *name, struct strbuf *ref)
>   */
>  int validate_new_branchname(const char *name, struct strbuf *ref, int force)
>  {
> -       const char *head;
> +       struct worktree **worktrees;
> +       const struct worktree *wt;
>
>         if (!validate_branchname(name, ref))
>                 return 0;
> @@ -208,9 +209,13 @@ int validate_new_branchname(const char *name, struct strbuf *ref, int force)
>                 die(_("a branch named '%s' already exists"),
>                     ref->buf + strlen("refs/heads/"));
>
> -       head = resolve_ref_unsafe("HEAD", 0, NULL, NULL);
> -       if (!is_bare_repository() && head && !strcmp(head, ref->buf))
> -               die(_("cannot force update the current branch"));
> +       worktrees = get_worktrees();
> +       wt = find_shared_symref(worktrees, "HEAD", ref->buf);
> +       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
Previous: Anders KaseorgNext: Jiang Xin
Message 18 of 20 in “protect branches checked out in all worktrees”
  1. 0/8 protect branches checked out in all worktreesAnders Kaseorg, Dec 1, 2021
  2. 1/8 fetch: lowercase error messagesAnders Kaseorg, Dec 1, 2021
  3. 3/8 branch: lowercase error messagesAnders Kaseorg, Dec 1, 2021
  4. 4/8 worktree: simplify find_shared_symref() memory ownership modelAnders Kaseorg, Dec 1, 2021
  5. Eric SunshineDec 1, 2021
  6. Anders KaseorgDec 1, 2021
  7. Eric SunshineDec 2, 2021
  8. Eric SunshineDec 2, 2021
  9. Anders KaseorgDec 2, 2021
  10. Eric SunshineDec 2, 2021
  11. 2/8 receive-pack: lowercase error messagesAnders Kaseorg, Dec 1, 2021
  12. 5/8 fetch: protect branches checked out in all worktreesAnders Kaseorg, Dec 1, 2021
  13. Eric SunshineDec 2, 2021
  14. Anders KaseorgDec 2, 2021
  15. 6/8 receive-pack: clean dead code from update_worktree()Anders Kaseorg, Dec 1, 2021
  16. 7/8 receive-pack: protect current branch for bare repository worktreeAnders Kaseorg, Dec 1, 2021
  17. 8/8 branch: protect branches checked out in all worktreesAnders Kaseorg, Dec 1, 2021
  18. Jiang XinDec 23, 2021
  19. Jiang XinJan 12, 2022
  20. Junio C HamanoJan 12, 2022

Read the whole thread, see it on lore, or plain text.

$ 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.