From: "René Scharfe" <l.s.r@web.de>
To: git@vger.kernel.org
Cc: "Matthias Aßhauer" <mha1993@live.de>
Subject: [PATCH 2/4] worktree add: reject separator-only path
Date: Tue, 25 Aug 2026 20:03:48 +0200 [thread overview]
Message-ID: <20260825180350.2099-3-l.s.r@web.de> (raw)
In-Reply-To: <20260825180350.2099-1-l.s.r@web.de>
worktree_basename() extracts an empty basename from a path consisting
only of zero or more path separators. We can't use that as a worktree
name. Properly report such a path as invalid instead of triggering a
BUG that asks the user what just happened.
Original-patch-by: Matthias Aßhauer <mha1993@live.de>
Signed-off-by: René Scharfe <l.s.r@web.de>
---
builtin/worktree.c | 2 ++
t/t2400-worktree-add.sh | 4 ++++
2 files changed, 6 insertions(+)
diff --git a/builtin/worktree.c b/builtin/worktree.c
index a770dd5ead..a53e815cc9 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -491,6 +491,8 @@ static int add_worktree(const char *path, const char *refname,
name = worktree_basename(path, &len);
strbuf_add(&sb, name, path + len - name);
+ if (!sb.len)
+ die(_("invalid path '%s'"), path);
sanitize_refname_component(sb.buf, &sb_name);
if (!sb_name.len)
BUG("How come '%s' becomes empty after sanitization?", sb.buf);
diff --git a/t/t2400-worktree-add.sh b/t/t2400-worktree-add.sh
index 87b926728a..280d2e2c07 100755
--- a/t/t2400-worktree-add.sh
+++ b/t/t2400-worktree-add.sh
@@ -46,6 +46,10 @@ test_expect_success '"add" refuses to checkout locked branch' '
test_path_is_missing .git/worktrees/zere
'
+test_expect_success '"add" rejects an empty path' '
+ test_must_fail git worktree add "" HEAD
+'
+
test_expect_success 'checking out paths not complaining about linked checkouts' '
(
cd existing_empty &&
--
2.55.0
next prev parent reply other threads:[~2026-08-25 18:04 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-25 18:03 [PATCH 0/4] worktree add: worktree_basename() fixes René Scharfe
2026-08-25 18:03 ` [PATCH 1/4] worktree add: don't read out of bounds in worktree_basename() René Scharfe
2026-08-25 18:03 ` René Scharfe [this message]
2026-08-25 18:03 ` [PATCH 3/4] worktree add: trim slashes when deriving branch name from path René Scharfe
2026-08-25 19:47 ` Junio C Hamano
2026-08-25 18:03 ` [PATCH 4/4] worktree add: let worktree_basename() return string copy René Scharfe
2026-08-25 20:04 ` Junio C Hamano
2026-08-26 4:37 ` René Scharfe
2026-08-26 14:35 ` Junio C Hamano
2026-08-31 18:56 ` 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=20260825180350.2099-3-l.s.r@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=mha1993@live.de \
/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.