From: Anders Kaseorg <andersk@mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Jeff King" <peff@peff.net>,
"Andreas Heiduk" <andreas.heiduk@mathema.de>,
"Ævar Arnfjörð Bjarmason " <avarab@gmail.com>,
"Jiang Xin" <worldhello.net@gmail.com>,
"Anders Kaseorg" <andersk@mit.edu>
Subject: [PATCH v7 0/8] protect branches checked out in all worktrees
Date: Wed, 1 Dec 2021 14:15:39 -0800 [thread overview]
Message-ID: <20211201221547.1796213-1-andersk@mit.edu> (raw)
‘git fetch’ (without ‘--update-head-ok’), ‘git receive-pack’, and ‘git
branch -M’ protect the currently checked out branch from being
accidentally updated. However, the code for these checks predates
‘git worktree’. Improve it to protect branches checked out in all
worktrees, not just the current one.
Anders Kaseorg (8):
fetch: lowercase error messages
receive-pack: lowercase error messages
branch: lowercase error messages
worktree: simplify find_shared_symref() memory ownership model
fetch: protect branches checked out in all worktrees
receive-pack: clean dead code from update_worktree()
receive-pack: protect current branch for bare repository worktree
branch: protect branches checked out in all worktrees
branch.c | 45 +++++++-----
builtin/branch.c | 7 +-
builtin/fetch.c | 119 +++++++++++++++++---------------
builtin/notes.c | 6 +-
builtin/receive-pack.c | 92 +++++++++++++-----------
t/t2018-checkout-branch.sh | 2 +-
t/t3200-branch.sh | 11 ++-
t/t5504-fetch-receive-strict.sh | 2 +-
t/t5516-fetch-push.sh | 32 +++++++++
worktree.c | 8 +--
worktree.h | 5 +-
11 files changed, 198 insertions(+), 131 deletions(-)
--
2.34.1
next reply other threads:[~2021-12-01 22:16 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-01 22:15 Anders Kaseorg [this message]
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
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211201221547.1796213-1-andersk@mit.edu \
--to=andersk@mit.edu \
--cc=Johannes.Schindelin@gmx.de \
--cc=andreas.heiduk@mathema.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=worldhello.net@gmail.com \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.