worktree: remove special case GVFS cmd blocking

Replace the special casing of the `worktree` command being blocked on
VFS-enabled repos with the new `BLOCK_ON_VFS_ENABLED` flag.

Signed-off-by: Matthew John Cheetham <[email protected]>

Author: mjcheetham

builtin/worktree.c

@@ -1451,13 +1451,6 @@ int cmd_worktree(int ac,
 
 	repo_config(the_repository, git_worktree_config, NULL);
 
-	/*
-	 * git-worktree is special-cased to work in Scalar repositories
-	 * even when they use the GVFS Protocol.
-	 */
-	if (gvfs_config_is_set(repo, GVFS_USE_VIRTUAL_FILESYSTEM))
-		die("'git %s' is not supported on a GVFS repo", "worktree");
-
 	if (!prefix)
 		prefix = "";
 

git.c

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