Permit repack command in Scalar clones (#732)

Currently when the `core.gvfs` setting is set, several commands are
outright blocked from running. Some of these commands, namely `repack`
are actually OK to run in a Scalar clone, even if it uses the GVFS
protocol (for Azure DevOps).

Introduce a different blocking mechanism to only block commands when the
virtual filesystem is being used, rather than as a broad block on any
`core.gvfs` setting.

Author: mjcheetham

builtin/repack.c

@@ -24,6 +24,7 @@
 #include "pack-bitmap.h"
 #include "refs.h"
 #include "list-objects-filter-options.h"
+#include "gvfs.h"
 
 #define ALL_INTO_ONE 1
 #define LOOSEN_UNREACHABLE 2
@@ -1243,7 +1244,7 @@ static const char *find_pack_prefix(const char *packdir, const char *packtmp)
 int cmd_repack(int argc,
 	       const char **argv,
 	       const char *prefix,
-	       struct repository *repo UNUSED)
+	       struct repository *repo)
 {
 	struct child_process cmd = CHILD_PROCESS_INIT;
 	struct string_list_item *item;
@@ -1255,6 +1256,7 @@ int cmd_repack(int argc,
 	int show_progress;
 	char **midx_pack_names = NULL;
 	size_t midx_pack_names_nr = 0;
+	const char *tmp_obj_dir = NULL;
 
 	/* variables to be filled by option parsing */
 	int delete_redundant = 0;
@@ -1384,6 +1386,10 @@ int cmd_repack(int argc,
 		write_bitmaps = 0;
 	}
 
+	if (gvfs_config_is_set(repo, GVFS_ANY_MASK) &&
+	    !repo_config_get_value(repo, "gvfs.sharedcache", &tmp_obj_dir))
+		warning(_("shared object cache is configured but will not be repacked"));
+
 	if (write_midx && write_bitmaps) {
 		struct strbuf path = STRBUF_INIT;
 

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

@@ -32,6 +32,7 @@
 #define DELAY_PAGER_CONFIG	(1<<4)
 #define NO_PARSEOPT		(1<<5) /* parse-options is not used */
 #define BLOCK_ON_GVFS_REPO	(1<<6) /* command not allowed in GVFS repos */
+#define BLOCK_ON_VFS_ENABLED	(1<<7) /* command not allowed when virtual file system is used */
 
 struct cmd_struct {
 	const char *cmd;
@@ -542,6 +543,9 @@ 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(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))
 		die("pre-command hook aborted command");
 
@@ -626,7 +630,7 @@ static struct cmd_struct commands[] = {
 	{ "for-each-ref", cmd_for_each_ref, RUN_SETUP },
 	{ "for-each-repo", cmd_for_each_repo, RUN_SETUP_GENTLY },
 	{ "format-patch", cmd_format_patch, RUN_SETUP },
-	{ "fsck", cmd_fsck, RUN_SETUP | BLOCK_ON_GVFS_REPO},
+	{ "fsck", cmd_fsck, RUN_SETUP | BLOCK_ON_VFS_ENABLED },
 	{ "fsck-objects", cmd_fsck, RUN_SETUP },
 	{ "fsmonitor--daemon", cmd_fsmonitor__daemon, RUN_SETUP },
 	{ "gc", cmd_gc, RUN_SETUP },
@@ -669,7 +673,7 @@ static struct cmd_struct commands[] = {
 	{ "pack-refs", cmd_pack_refs, RUN_SETUP },
 	{ "patch-id", cmd_patch_id, RUN_SETUP_GENTLY | NO_PARSEOPT },
 	{ "pickaxe", cmd_blame, RUN_SETUP },
-	{ "prune", cmd_prune, RUN_SETUP | BLOCK_ON_GVFS_REPO},
+	{ "prune", cmd_prune, RUN_SETUP | BLOCK_ON_VFS_ENABLED },
 	{ "prune-packed", cmd_prune_packed, RUN_SETUP },
 	{ "pull", cmd_pull, RUN_SETUP | NEED_WORK_TREE },
 	{ "push", cmd_push, RUN_SETUP },
@@ -682,7 +686,7 @@ static struct cmd_struct commands[] = {
 	{ "remote", cmd_remote, RUN_SETUP },
 	{ "remote-ext", cmd_remote_ext, NO_PARSEOPT },
 	{ "remote-fd", cmd_remote_fd, NO_PARSEOPT },
-	{ "repack", cmd_repack, RUN_SETUP | BLOCK_ON_GVFS_REPO },
+	{ "repack", cmd_repack, RUN_SETUP | BLOCK_ON_VFS_ENABLED },
 	{ "replace", cmd_replace, RUN_SETUP },
 	{ "replay", cmd_replay, RUN_SETUP },
 	{ "rerere", cmd_rerere, RUN_SETUP },
@@ -725,7 +729,7 @@ static struct cmd_struct commands[] = {
 #ifndef WITH_BREAKING_CHANGES
 	{ "whatchanged", cmd_whatchanged, RUN_SETUP },
 #endif
-	{ "worktree", cmd_worktree, RUN_SETUP | BLOCK_ON_GVFS_REPO },
+	{ "worktree", cmd_worktree, RUN_SETUP | BLOCK_ON_VFS_ENABLED },
 	{ "write-tree", cmd_write_tree, RUN_SETUP },
 };
 

gvfs.h

@@ -30,6 +30,8 @@ struct repository;
 #define GVFS_BLOCK_FILTERS_AND_EOL_CONVERSIONS      (1 << 6)
 #define GVFS_PREFETCH_DURING_FETCH		    (1 << 7)
 
+#define GVFS_ANY_MASK                               0xFFFFFFFF
+
 int gvfs_config_is_set(struct repository *r, int mask);
 int gvfs_virtualize_objects(struct repository *r);
 

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

@@ -22,7 +22,6 @@ not_with_gvfs fsck
 not_with_gvfs gc
 not_with_gvfs gc --auto
 not_with_gvfs prune
-not_with_gvfs repack
 not_with_gvfs submodule status
 not_with_gvfs update-index --index-version 2
 not_with_gvfs update-index --skip-worktree
@@ -36,4 +35,14 @@ test_expect_success 'test gc --auto succeeds when disabled via config' '
 	git gc --auto
 '
 
+test_expect_success 'test repack fails with VFS bit enabled' '
+	test_config core.gvfs true &&
+	test_must_fail git repack
+'
+
+test_expect_success 'test repack succeeds with VFS bit disabled' '
+	test_config core.gvfs 150 &&
+	git repack
+'
+
 test_done