From: Junio C Hamano <gitster@pobox.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2 0/3] worktree: stop using "the_repository" in is_current_worktree()
Date: Sun, 15 Mar 2026 14:17:44 -0700 [thread overview]
Message-ID: <xmqqzf48rdvr.fsf@gitster.g> (raw)
In-Reply-To: <cover.1773591528.git.phillip.wood@dunelm.org.uk> (Phillip Wood's message of "Sun, 15 Mar 2026 16:18:49 +0000")
Phillip Wood <phillip.wood123@gmail.com> writes:
> Range-diff against v1:
> 1: 075700a2256 = 1: 075700a2256 worktree: remove "the_repository" from is_current_worktree()
> 2: ae2a368e7e7 ! 2: c3c5767725d worktree add: stop reading ".git/HEAD"
> @@ builtin/worktree.c: static int can_use_local_refs(const struct add_opts *opts)
> - free(wt_gitdir);
> - }
> + if (!opts->quiet)
> -+ warning(_("HEAD points to an invalid (or orphaned) reference.\n"));
> ++ warning(_("HEAD points to an invalid (or orphaned) reference.\n"));
> return 1;
> }
> return 0;
> 3: 1151b5b3020 ! 3: 75eecc8492e worktree: reject NULL worktree in get_worktree_git_dir()
> @@ worktree.c: struct worktree **get_worktrees_without_reading_head(void)
> else if (!wt->id)
> return xstrdup(repo_get_common_dir(wt->repo));
> else
> +
> + ## worktree.h ##
> +@@ worktree.h: int submodule_uses_worktrees(const char *path);
> +
> + /*
> + * Return git dir of the worktree. Note that the path may be relative.
> +- * If wt is NULL, git dir of current worktree is returned.
> + */
> + char *get_worktree_git_dir(const struct worktree *wt);
> +
Ah, I somehow expected to see that we say "passing NULL to wt is an
error", but that is misleading. When something expects a worktree
instance, and it accepts NULL as a special case, then that is worth
commenting, but otherwise, it is not worth mentioning.
All look good. Will replace. Thanks.
next prev parent reply other threads:[~2026-03-15 21:17 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-13 14:19 [PATCH 0/3] worktree: stop using "the_repository" in is_current_worktree() Phillip Wood
2026-03-13 14:19 ` [PATCH 1/3] worktree: remove "the_repository" from is_current_worktree() Phillip Wood
2026-03-13 14:19 ` [PATCH 2/3] worktree add: stop reading ".git/HEAD" Phillip Wood
2026-03-13 21:41 ` Junio C Hamano
2026-03-13 14:19 ` [PATCH 3/3] worktree: reject NULL worktree in get_worktree_git_dir() Phillip Wood
2026-03-13 21:42 ` Junio C Hamano
2026-03-14 20:09 ` Phillip Wood
2026-03-15 16:18 ` [PATCH v2 0/3] worktree: stop using "the_repository" in is_current_worktree() Phillip Wood
2026-03-15 16:18 ` [PATCH v2 1/3] worktree: remove "the_repository" from is_current_worktree() Phillip Wood
2026-03-16 7:38 ` Patrick Steinhardt
2026-03-16 16:22 ` Phillip Wood
2026-03-17 10:24 ` Phillip Wood
2026-03-23 9:41 ` Shreyansh Paliwal
2026-03-23 14:37 ` Phillip Wood
2026-03-23 17:05 ` Shreyansh Paliwal
2026-03-15 16:18 ` [PATCH v2 2/3] worktree add: stop reading ".git/HEAD" Phillip Wood
2026-03-16 7:39 ` Patrick Steinhardt
2026-03-15 16:18 ` [PATCH v2 3/3] worktree: reject NULL worktree in get_worktree_git_dir() Phillip Wood
2026-03-15 21:17 ` Junio C Hamano [this message]
2026-03-26 14:16 ` [PATCH v3 0/3] worktree: stop using "the_repository" in is_current_worktree() Phillip Wood
2026-03-26 14:16 ` [PATCH v3 1/3] worktree: remove "the_repository" from is_current_worktree() Phillip Wood
2026-03-26 15:48 ` Junio C Hamano
2026-03-27 16:40 ` Phillip Wood
2026-03-27 17:07 ` Junio C Hamano
2026-04-02 15:10 ` Phillip Wood
2026-03-26 14:16 ` [PATCH v3 2/3] worktree add: stop reading ".git/HEAD" Phillip Wood
2026-03-26 14:16 ` [PATCH v3 3/3] worktree: reject NULL worktree in get_worktree_git_dir() Phillip Wood
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=xmqqzf48rdvr.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=phillip.wood123@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.