worktree: address PR feedback

Move the VFS worktree block from the generic BLOCK_ON_VFS_ENABLED
check in run_builtin() to an explicit check in cmd_worktree(). This
keeps the worktree entry in the commands table clean (RUN_SETUP only)
and makes the VFS guard self-contained in builtin/worktree.c.

Guard the skip-clean-check marker behind core_virtualfilesystem so
it only takes effect when VFS is active.

Consolidate the worktree tests into a single test case that covers
add (with --no-checkout verification), list, and remove. Use
core.gvfs=true instead of the magic number 351.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: Tyrie Vella

builtin/worktree.c

@@ -1420,7 +1420,7 @@ static int remove_worktree(int ac, const char **av, const char *prefix,
 	strbuf_release(&errmsg);
 
 	if (file_exists(wt->path)) {
-		if (!force && !should_skip_clean_check(wt))
+		if (!force && !(core_virtualfilesystem && should_skip_clean_check(wt)))
 			check_clean_worktree(wt, av[0]);
 
 		ret |= delete_git_work_tree(wt);
@@ -1492,6 +1492,14 @@ int cmd_worktree(int ac,
 
 	ac = parse_options(ac, av, prefix, options, git_worktree_usage, 0);
 
+	/*
+	 * Block worktree commands when VFS is active unless the VFS layer
+	 * has signaled worktree support via GVFS_SUPPORTS_WORKTREES.
+	 */
+	if (gvfs_config_is_set(the_repository, GVFS_USE_VIRTUAL_FILESYSTEM) &&
+	    !gvfs_config_is_set(the_repository, GVFS_SUPPORTS_WORKTREES))
+		die("'git worktree' is not supported when using the virtual file system");
+
 	prepare_repo_settings(the_repository);
 	the_repository->settings.command_requires_full_index = 0;
 

git.c

@@ -574,8 +574,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv, struct
 		die("'git %s' is not supported on a GVFS repo", p->cmd);
 
 	if (!help && p->option & BLOCK_ON_VFS_ENABLED && gvfs_config_is_set(repo, GVFS_USE_VIRTUAL_FILESYSTEM))
-		if (strcmp(p->cmd, "worktree") != 0 || !gvfs_config_is_set(repo, GVFS_SUPPORTS_WORKTREES))
-			die("'git %s' is not supported when using the virtual file system", p->cmd);
+		die("'git %s' is not supported when using the virtual file system", p->cmd);
 
 	if (run_pre_command_hook(the_repository, argv))
 		die("pre-command hook aborted command");
@@ -762,7 +761,7 @@ static struct cmd_struct commands[] = {
 #ifndef WITH_BREAKING_CHANGES
 	{ "whatchanged", cmd_whatchanged, RUN_SETUP | DEPRECATED },
 #endif
-	{ "worktree", cmd_worktree, RUN_SETUP | BLOCK_ON_VFS_ENABLED },
+	{ "worktree", cmd_worktree, RUN_SETUP },
 	{ "write-tree", cmd_write_tree, RUN_SETUP },
 };
 

t/t0402-block-command-on-gvfs.sh

@@ -29,52 +29,31 @@ not_with_gvfs update-index --no-skip-worktree
 not_with_gvfs update-index --split-index
 
 # worktree is conditionally allowed: blocked when VFS enabled without
-# GVFS_SUPPORTS_WORKTREES, but core.gvfs=true sets all bits including
-# SUPPORTS_WORKTREES, so we test the blocked case with a specific bitmask.
+# GVFS_SUPPORTS_WORKTREES.
 test_expect_success 'worktree blocked with VFS but without SUPPORTS_WORKTREES' '
 	test_config core.gvfs 95 &&
 	test_must_fail git worktree list 2>err &&
 	test_grep "not supported when using the virtual file system" err
 '
 
-# core.gvfs bitmask values:
-#   GVFS_USE_VIRTUAL_FILESYSTEM = (1 << 3) = 8
-#   GVFS_SUPPORTS_WORKTREES     = (1 << 8) = 256
-# A typical VFS-enabled repo has core.gvfs=95 (bits 0-4,6).
-# Adding SUPPORTS_WORKTREES: 95 + 256 = 351.
+test_expect_success 'worktree operations work when SUPPORTS_WORKTREES is set' '
+	test_commit initial &&
 
-test_expect_success 'setup for worktree tests' '
-	test_commit initial
-'
-
-test_expect_success 'worktree allowed when SUPPORTS_WORKTREES bit is set' '
-	test_when_finished "git worktree remove --force ../allowed-wt 2>/dev/null; true" &&
-	test_config core.gvfs 351 &&
-	git worktree add ../allowed-wt &&
-	test_path_exists ../allowed-wt/.git
-'
+	# Use core.gvfs=true which sets all bits including SUPPORTS_WORKTREES.
+	test_config core.gvfs true &&
 
-test_expect_success 'worktree add forces --no-checkout when VFS active' '
-	test_when_finished "git worktree remove --force ../nocheckout-wt 2>/dev/null; true" &&
-	test_config core.gvfs 351 &&
-	git worktree add ../nocheckout-wt &&
-	test_path_exists ../nocheckout-wt/.git &&
-	! test_path_exists ../nocheckout-wt/initial.t
-'
+	# add: succeeds, forces --no-checkout (no initial.t on disk)
+	git worktree add ../vfs-wt &&
+	test_path_exists ../vfs-wt/.git &&
+	! test_path_exists ../vfs-wt/initial.t &&
 
-test_expect_success 'worktree list works with SUPPORTS_WORKTREES' '
-	test_when_finished "git worktree remove --force ../list-wt 2>/dev/null; true" &&
-	test_config core.gvfs 351 &&
-	git worktree add ../list-wt &&
+	# list: shows the worktree
 	git worktree list >out &&
-	grep "list-wt" out
-'
+	grep "vfs-wt" out &&
 
-test_expect_success 'worktree remove works with SUPPORTS_WORKTREES' '
-	test_config core.gvfs 351 &&
-	git worktree add ../remove-wt &&
-	git worktree remove --force ../remove-wt &&
-	! test_path_exists ../remove-wt
+	# remove: cleans up
+	git worktree remove --force ../vfs-wt &&
+	! test_path_exists ../vfs-wt
 '
 
 test_expect_success 'test gc --auto succeeds when disabled via config' '