diff --git a/BRANCHES.md b/BRANCHES.md
new file mode 100644
index 00000000000000..364158375e7d55
--- /dev/null
+++ b/BRANCHES.md
@@ -0,0 +1,59 @@
+Branches used in this repo
+==========================
+
+The document explains the branching structure that we are using in the VFSForGit repository as well as the forking strategy that we have adopted for contributing.
+
+Repo Branches
+-------------
+
+1. `vfs-#`
+
+    These branches are used to track the specific version that match Git for Windows with the VFSForGit specific patches on top.  When a new version of Git for Windows is released, the VFSForGit patches will be rebased on that windows version and a new gvfs-# branch created to create pull requests against.
+
+    #### Examples
+
+    ```
+    vfs-2.27.0
+    vfs-2.30.0
+    ```
+
+    The versions of git for VFSForGit are based on the Git for Windows versions.  v2.20.0.vfs.1 will correspond with the v2.20.0.windows.1 with the VFSForGit specific patches applied to the windows version.
+
+2. `vfs-#-exp`
+
+   These branches are for releasing experimental features to early adopters. They
+   should contain everything within the corresponding `vfs-#` branch; if the base
+   branch updates, then merge into the `vfs-#-exp` branch as well.
+
+Tags
+----
+
+We are using annotated tags to build the version number for git.  The build will look back through the commit history to find the first tag matching `v[0-9]*vfs*` and build the git version number using that tag.
+
+Full releases are of the form `v2.XX.Y.vfs.Z.W` where `v2.XX.Y` comes from the
+upstream version and `Z.W` are custom updates within our fork. Specifically,
+the `.Z` value represents the "compatibility level" with VFS for Git. Only
+increase this version when making a breaking change with a released version
+of VFS for Git. The `.W` version is used for minor updates between major
+versions.
+
+Experimental releases are of the form `v2.XX.Y.vfs.Z.W.exp`. The `.exp`
+suffix indicates that experimental features are available. The rest of the
+version string comes from the full release tag. These versions will only
+be made available as pre-releases on the releases page, never a full release.
+
+Forking
+-------
+
+A personal fork of this repository and a branch in that repository should be used for development.
+
+These branches should be based on the latest vfs-# branch.  If there are work in progress pull requests that you have based on a previous version branch when a new version branch is created, you will need to move your patches to the new branch to get them in that latest version.
+
+#### Example
+
+```
+git clone <personal fork repo URL>
+git remote add ms https://github.com/Microsoft/git.git
+git checkout -b my-changes ms/vfs-2.20.0 --no-track
+git push -fu origin HEAD
+```
diff --git a/Makefile b/Makefile
index 3113dfdb069140..05bc3358b2c27a 100644
--- a/Makefile
+++ b/Makefile
@@ -1042,6 +1042,7 @@ LIB_OBJS += git-zlib.o
 LIB_OBJS += gpg-interface.o
 LIB_OBJS += graph.o
 LIB_OBJS += grep.o
+LIB_OBJS += gvfs.o
 LIB_OBJS += hash-lookup.o
 LIB_OBJS += hashmap.o
 LIB_OBJS += help.o
diff --git a/apply.c b/apply.c
index 438bea419a17fa..775b4ed7736a5d 100644
--- a/apply.c
+++ b/apply.c
@@ -3377,6 +3377,24 @@ static int checkout_target(struct index_state *istate,
 {
 	struct checkout costate = CHECKOUT_INIT;
 
+	/*
+	 * Do not checkout the entry if the skipworktree bit is set
+	 *
+	 * Both callers of this method (check_preimage and load_current)
+	 * check for the existance of the file before calling this
+	 * method so we know that the file doesn't exist at this point
+	 * and we don't need to perform that check again here.
+	 * We just need to check the skip-worktree and return.
+	 *
+	 * This is to prevent git from creating a file in the
+	 * working directory that has the skip-worktree bit on,
+	 * then updating the index from the patch and not keeping
+	 * the working directory version up to date with what it
+	 * changed the index version to be.
+	 */
+	if (ce_skip_worktree(ce))
+		return 0;
+
 	costate.refresh_cache = 1;
 	costate.istate = istate;
 	if (checkout_entry(ce, &costate, NULL, NULL) ||
diff --git a/builtin/gc.c b/builtin/gc.c
index fa6e52ddde109e..752171c40e587d 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -16,6 +16,7 @@
 #include "environment.h"
 #include "hex.h"
 #include "repository.h"
+#include "gvfs.h"
 #include "config.h"
 #include "tempfile.h"
 #include "lockfile.h"
@@ -621,6 +622,9 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
 	if (quiet)
 		strvec_push(&repack, "-q");
 
+	if ((!auto_gc || (auto_gc && gc_auto_threshold > 0)) && gvfs_config_is_set(GVFS_BLOCK_COMMANDS))
+		die(_("'git gc' is not supported on a GVFS repo"));
+
 	if (auto_gc) {
 		/*
 		 * Auto-gc should be least intrusive as possible.
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 5fab9ad2ec46fd..492b16bd0570f6 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -5,6 +5,7 @@
  */
 #define USE_THE_INDEX_VARIABLE
 #include "cache.h"
+#include "gvfs.h"
 #include "bulk-checkin.h"
 #include "config.h"
 #include "environment.h"
@@ -1180,7 +1181,13 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
 	argc = parse_options_end(&ctx);
 
 	getline_fn = nul_term_line ? strbuf_getline_nul : strbuf_getline_lf;
+	if (mark_skip_worktree_only && gvfs_config_is_set(GVFS_BLOCK_COMMANDS))
+		die(_("modifying the skip worktree bit is not supported on a GVFS repo"));
+
 	if (preferred_index_format) {
+		if (preferred_index_format != 4 && gvfs_config_is_set(GVFS_BLOCK_COMMANDS))
+			die(_("changing the index version is not supported on a GVFS repo"));
+
 		if (preferred_index_format < INDEX_FORMAT_LB ||
 		    INDEX_FORMAT_UB < preferred_index_format)
 			die("index-version %d not in range: %d..%d",
@@ -1221,6 +1228,9 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
 	end_odb_transaction();
 
 	if (split_index > 0) {
+		if (gvfs_config_is_set(GVFS_BLOCK_COMMANDS))
+			die(_("split index is not supported on a GVFS repo"));
+
 		if (git_config_get_split_index() == 0)
 			warning(_("core.splitIndex is set to false; "
 				  "remove or change it, if you really want to "
diff --git a/builtin/worktree.c b/builtin/worktree.c
index f3180463be2a98..83989de737997a 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "abspath.h"
+#include "gvfs.h"
 #include "checkout.h"
 #include "config.h"
 #include "copy.h"
@@ -1196,6 +1197,13 @@ int cmd_worktree(int ac, const char **av, const char *prefix)
 
 	git_config(git_worktree_config, NULL);
 
+	/*
+	 * git-worktree is special-cased to work in Scalar repositories
+	 * even when they use the GVFS Protocol.
+	 */
+	if (core_gvfs & GVFS_USE_VIRTUAL_FILESYSTEM)
+		die("'git %s' is not supported on a GVFS repo", "worktree");
+
 	if (!prefix)
 		prefix = "";
 
diff --git a/cache-tree.c b/cache-tree.c
index fea14c04f56493..d67ae8d45e824c 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -429,7 +429,29 @@ static int update_one(struct cache_tree *it,
 			continue;
 
 		strbuf_grow(&buffer, entlen + 100);
-		strbuf_addf(&buffer, "%o %.*s%c", mode, entlen, path + baselen, '\0');
+
+		switch (mode) {
+		case 0100644:
+			strbuf_add(&buffer, "100644 ", 7);
+			break;
+		case 0100664:
+			strbuf_add(&buffer, "100664 ", 7);
+			break;
+		case 0100755:
+			strbuf_add(&buffer, "100755 ", 7);
+			break;
+		case 0120000:
+			strbuf_add(&buffer, "120000 ", 7);
+			break;
+		case 0160000:
+			strbuf_add(&buffer, "160000 ", 7);
+			break;
+		default:
+			strbuf_addf(&buffer, "%o ", mode);
+			break;
+		}
+		strbuf_add(&buffer, path + baselen, entlen);
+		strbuf_addch(&buffer, '\0');
 		strbuf_add(&buffer, oid->hash, the_hash_algo->rawsz);
 
 #if DEBUG_CACHE_TREE
diff --git a/git.c b/git.c
index 2f42da20f4e0df..1a30af3a9b2aa2 100644
--- a/git.c
+++ b/git.c
@@ -1,4 +1,5 @@
 #include "builtin.h"
+#include "gvfs.h"
 #include "config.h"
 #include "environment.h"
 #include "exec-cmd.h"
@@ -13,6 +14,8 @@
 #include "shallow.h"
 #include "trace.h"
 #include "trace2.h"
+#include "dir.h"
+#include "hook.h"
 
 #define RUN_SETUP		(1<<0)
 #define RUN_SETUP_GENTLY	(1<<1)
@@ -24,6 +27,7 @@
 #define NEED_WORK_TREE		(1<<3)
 #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 */
 
 struct cmd_struct {
 	const char *cmd;
@@ -424,6 +428,68 @@ static int handle_alias(int *argcp, const char ***argv)
 	return ret;
 }
 
+/* Runs pre/post-command hook */
+static struct strvec sargv = STRVEC_INIT;
+static int run_post_hook = 0;
+static int exit_code = -1;
+
+static int run_pre_command_hook(const char **argv)
+{
+	char *lock;
+	int ret = 0;
+	struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;
+
+	/*
+	 * Ensure the global pre/post command hook is only called for
+	 * the outer command and not when git is called recursively
+	 * or spawns multiple commands (like with the alias command)
+	 */
+	lock = getenv("COMMAND_HOOK_LOCK");
+	if (lock && !strcmp(lock, "true"))
+		return 0;
+	setenv("COMMAND_HOOK_LOCK", "true", 1);
+
+	/* call the hook proc */
+	strvec_pushv(&sargv, argv);
+	strvec_pushf(&sargv, "--git-pid=%"PRIuMAX, (uintmax_t)getpid());
+	strvec_pushv(&opt.args, sargv.v);
+	ret = run_hooks_opt("pre-command", &opt);
+
+	if (!ret)
+		run_post_hook = 1;
+	return ret;
+}
+
+static int run_post_command_hook(void)
+{
+	char *lock;
+	int ret = 0;
+	struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;
+
+	/*
+	 * Only run post_command if pre_command succeeded in this process
+	 */
+	if (!run_post_hook)
+		return 0;
+	lock = getenv("COMMAND_HOOK_LOCK");
+	if (!lock || strcmp(lock, "true"))
+		return 0;
+
+	strvec_pushv(&opt.args, sargv.v);
+	strvec_pushf(&opt.args, "--exit_code=%u", exit_code);
+	ret = run_hooks_opt("post-command", &opt);
+
+	run_post_hook = 0;
+	strvec_clear(&sargv);
+	setenv("COMMAND_HOOK_LOCK", "false", 1);
+	return ret;
+}
+
+static void post_command_hook_atexit(void)
+{
+	run_post_command_hook();
+}
+
 static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
 {
 	int status, help;
@@ -459,18 +525,26 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
 	if (!help && p->option & NEED_WORK_TREE)
 		setup_work_tree();
 
+	if (!help && p->option & BLOCK_ON_GVFS_REPO && gvfs_config_is_set(GVFS_BLOCK_COMMANDS))
+		die("'git %s' is not supported on a GVFS repo", p->cmd);
+
+	if (run_pre_command_hook(argv))
+		die("pre-command hook aborted command");
+
 	trace_argv_printf(argv, "trace: built-in: git");
 	trace2_cmd_name(p->cmd);
 	trace2_cmd_list_config();
 	trace2_cmd_list_env_vars();
 
 	validate_cache_entries(the_repository->index);
-	status = p->fn(argc, argv, prefix);
+	exit_code = status = p->fn(argc, argv, prefix);
 	validate_cache_entries(the_repository->index);
 
 	if (status)
 		return status;
 
+	run_post_command_hook();
+
 	/* Somebody closed stdout? */
 	if (fstat(fileno(stdout), &st))
 		return 0;
@@ -538,7 +612,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 },
+	{ "fsck", cmd_fsck, RUN_SETUP | BLOCK_ON_GVFS_REPO},
 	{ "fsck-objects", cmd_fsck, RUN_SETUP },
 	{ "fsmonitor--daemon", cmd_fsmonitor__daemon, RUN_SETUP },
 	{ "gc", cmd_gc, RUN_SETUP },
@@ -579,7 +653,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 },
+	{ "prune", cmd_prune, RUN_SETUP | BLOCK_ON_GVFS_REPO},
 	{ "prune-packed", cmd_prune_packed, RUN_SETUP },
 	{ "pull", cmd_pull, RUN_SETUP | NEED_WORK_TREE },
 	{ "push", cmd_push, RUN_SETUP },
@@ -591,7 +665,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 },
+	{ "repack", cmd_repack, RUN_SETUP | BLOCK_ON_GVFS_REPO },
 	{ "replace", cmd_replace, RUN_SETUP },
 	{ "rerere", cmd_rerere, RUN_SETUP },
 	{ "reset", cmd_reset, RUN_SETUP },
@@ -611,7 +685,7 @@ static struct cmd_struct commands[] = {
 	{ "stash", cmd_stash, RUN_SETUP | NEED_WORK_TREE },
 	{ "status", cmd_status, RUN_SETUP | NEED_WORK_TREE },
 	{ "stripspace", cmd_stripspace },
-	{ "submodule--helper", cmd_submodule__helper, RUN_SETUP },
+	{ "submodule--helper", cmd_submodule__helper, RUN_SETUP | BLOCK_ON_GVFS_REPO },
 	{ "switch", cmd_switch, RUN_SETUP | NEED_WORK_TREE },
 	{ "symbolic-ref", cmd_symbolic_ref, RUN_SETUP },
 	{ "tag", cmd_tag, RUN_SETUP | DELAY_PAGER_CONFIG },
@@ -747,13 +821,16 @@ static void execv_dashed_external(const char **argv)
 	 */
 	trace_argv_printf(cmd.args.v, "trace: exec:");
 
+	if (run_pre_command_hook(cmd.args.v))
+		die("pre-command hook aborted command");
+
 	/*
 	 * If we fail because the command is not found, it is
 	 * OK to return. Otherwise, we just pass along the status code,
 	 * or our usual generic code if we were not even able to exec
 	 * the program.
 	 */
-	status = run_command(&cmd);
+	exit_code = status = run_command(&cmd);
 
 	/*
 	 * If the child process ran and we are now going to exit, emit a
@@ -764,6 +841,8 @@ static void execv_dashed_external(const char **argv)
 		exit(status);
 	else if (errno != ENOENT)
 		exit(128);
+
+	run_post_command_hook();
 }
 
 static int run_argv(int *argcp, const char ***argv)
@@ -871,6 +950,7 @@ int cmd_main(int argc, const char **argv)
 	}
 
 	trace_command_performance(argv);
+	atexit(post_command_hook_atexit);
 
 	/*
 	 * "git-xxxx" is the same as "git xxxx", but we obviously:
@@ -896,10 +976,14 @@ int cmd_main(int argc, const char **argv)
 	if (!argc) {
 		/* The user didn't specify a command; give them help */
 		commit_pager_choice();
+		if (run_pre_command_hook(argv))
+			die("pre-command hook aborted command");
 		printf(_("usage: %s\n\n"), git_usage_string);
 		list_common_cmds_help();
 		printf("\n%s\n", _(git_more_info_string));
-		exit(1);
+		exit_code = 1;
+		run_post_command_hook();
+		exit(exit_code);
 	}
 
 	if (!strcmp("--version", argv[0]) || !strcmp("-v", argv[0]))
diff --git a/gvfs.c b/gvfs.c
new file mode 100644
index 00000000000000..c4ca8a9474772a
--- /dev/null
+++ b/gvfs.c
@@ -0,0 +1,38 @@
+#include "git-compat-util.h"
+#include "environment.h"
+#include "gvfs.h"
+#include "setup.h"
+#include "config.h"
+
+static int gvfs_config_loaded;
+static int core_gvfs_is_bool;
+
+static int early_core_gvfs_config(const char *var, const char *value, void *data)
+{
+	if (!strcmp(var, "core.gvfs"))
+		core_gvfs = git_config_bool_or_int("core.gvfs", value, &core_gvfs_is_bool);
+	return 0;
+}
+
+void gvfs_load_config_value(const char *value)
+{
+	if (value)
+		core_gvfs = git_config_bool_or_int("core.gvfs", value, &core_gvfs_is_bool);
+	else if (startup_info->have_repository == 0)
+		read_early_config(early_core_gvfs_config, NULL);
+	else
+		git_config_get_bool_or_int("core.gvfs", &core_gvfs_is_bool, &core_gvfs);
+
+	/* Turn on all bits if a bool was set in the settings */
+	if (core_gvfs_is_bool && core_gvfs)
+		core_gvfs = -1;
+}
+
+int gvfs_config_is_set(int mask)
+{
+	if (!gvfs_config_loaded)
+		gvfs_load_config_value(NULL);
+
+	gvfs_config_loaded = 1;
+	return (core_gvfs & mask) == mask;
+}
diff --git a/gvfs.h b/gvfs.h
index bfa82d29e02739..a8e58a6ebc88b8 100644
--- a/gvfs.h
+++ b/gvfs.h
@@ -1,8 +1,6 @@
 #ifndef GVFS_H
 #define GVFS_H
 
-#include "environment.h"
-#include "config.h"
 
 /*
  * This file is for the specific settings and methods
@@ -14,37 +12,24 @@
  * The list of bits in the core_gvfs setting
  */
 #define GVFS_SKIP_SHA_ON_INDEX                      (1 << 0)
+#define GVFS_BLOCK_COMMANDS                         (1 << 1)
 #define GVFS_MISSING_OK                             (1 << 2)
+
+/*
+ * This behavior of not deleting outside of the sparse-checkout
+ * is specific to the virtual filesystem support. It is only
+ * enabled by VFS for Git, and so can be used as an indicator
+ * that we are in a virtualized filesystem environment and not
+ * in a Scalar environment. This bit has two names to reflect
+ * that.
+ */
 #define GVFS_NO_DELETE_OUTSIDE_SPARSECHECKOUT       (1 << 3)
+#define GVFS_USE_VIRTUAL_FILESYSTEM                 (1 << 3)
+
 #define GVFS_FETCH_SKIP_REACHABILITY_AND_UPLOADPACK (1 << 4)
 #define GVFS_BLOCK_FILTERS_AND_EOL_CONVERSIONS      (1 << 6)
 
-static inline int gvfs_config_is_set(int mask) {
-	return (core_gvfs & mask) == mask;
-}
-
-static inline int gvfs_config_is_set_any(void) {
-	return core_gvfs > 0;
-}
-
-static inline void gvfs_load_config_value(const char *value) {
-	int is_bool = 0;
-
-	if (value)
-		core_gvfs = git_config_bool_or_int("core.gvfs", value, &is_bool);
-	else
-		git_config_get_bool_or_int("core.gvfs", &is_bool, &core_gvfs);
-
-	/* Turn on all bits if a bool was set in the settings */
-	if (is_bool && core_gvfs)
-		core_gvfs = -1;
-}
-
-
-static inline int gvfs_config_load_and_is_set(int mask) {
-	gvfs_load_config_value(0);
-	return gvfs_config_is_set(mask);
-}
-
+void gvfs_load_config_value(const char *value);
+int gvfs_config_is_set(int mask);
 
 #endif /* GVFS_H */
diff --git a/hook.c b/hook.c
index 3ca5e60895d65f..6977ed9f7cd066 100644
--- a/hook.c
+++ b/hook.c
@@ -1,4 +1,5 @@
 #include "git-compat-util.h"
+#include "environment.h"
 #include "advice.h"
 #include "gettext.h"
 #include "hook.h"
@@ -6,13 +7,74 @@
 #include "run-command.h"
 #include "config.h"
 #include "strbuf.h"
+#include "setup.h"
+
+static int early_hooks_path_config(const char *var, const char *value, void *data)
+{
+	if (!strcmp(var, "core.hookspath"))
+		return git_config_pathname((const char **)data, var, value);
+
+	return 0;
+}
+
+/* Discover the hook before setup_git_directory() was called */
+static const char *hook_path_early(const char *name, struct strbuf *result)
+{
+	static struct strbuf hooks_dir = STRBUF_INIT;
+	static int initialized;
+
+	if (initialized < 0)
+		return NULL;
+
+	if (!initialized) {
+		struct strbuf gitdir = STRBUF_INIT, commondir = STRBUF_INIT;
+		const char *early_hooks_dir = NULL;
+
+		if (discover_git_directory(&commondir, &gitdir) < 0) {
+			initialized = -1;
+			return NULL;
+		}
+
+		read_early_config(early_hooks_path_config, &early_hooks_dir);
+		if (!early_hooks_dir)
+			strbuf_addf(&hooks_dir, "%s/hooks/", commondir.buf);
+		else {
+			strbuf_add_absolute_path(&hooks_dir, early_hooks_dir);
+			free((void *)early_hooks_dir);
+			strbuf_addch(&hooks_dir, '/');
+		}
+
+		strbuf_release(&gitdir);
+		strbuf_release(&commondir);
+
+		initialized = 1;
+	}
+
+	strbuf_addf(result, "%s%s", hooks_dir.buf, name);
+	return result->buf;
+}
 
 const char *find_hook(const char *name)
 {
 	static struct strbuf path = STRBUF_INIT;
 
 	strbuf_reset(&path);
-	strbuf_git_path(&path, "hooks/%s", name);
+	if (have_git_dir()) {
+		static int forced_config;
+
+		if (!forced_config) {
+			if (!git_hooks_path) {
+				git_config_get_pathname("core.hookspath",
+							&git_hooks_path);
+				UNLEAK(git_hooks_path);
+			}
+			forced_config = 1;
+		}
+
+		strbuf_git_path(&path, "hooks/%s", name);
+	} else if (!hook_path_early(name, &path))
+		return NULL;
+
 	if (access(path.buf, X_OK) < 0) {
 		int err = errno;
 
diff --git a/merge-recursive.c b/merge-recursive.c
index 45a141600513d1..6210dd629bde7b 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1544,7 +1544,7 @@ static int handle_change_delete(struct merge_options *opt,
 		 * path.  We could call update_file_flags() with update_cache=0
 		 * and update_wd=0, but that's a no-op.
 		 */
-		if (change_branch != opt->branch1 || alt_path)
+		if (change_branch != opt->branch1 || alt_path || !file_exists(update_path))
 			ret = update_file(opt, 0, changed, update_path);
 	}
 	free(alt_path);
diff --git a/send-pack.c b/send-pack.c
index bc6b05afba340c..b0c501cb3a4f62 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -5,6 +5,7 @@
 #include "gettext.h"
 #include "hex.h"
 #include "refs.h"
+#include "gvfs.h"
 #include "object-store.h"
 #include "pkt-line.h"
 #include "sideband.h"
@@ -57,7 +58,7 @@ static int send_pack_config(const char *var, const char *value, void *unused)
 
 static void feed_object(const struct object_id *oid, FILE *fh, int negative)
 {
-	if (negative &&
+	if (negative && !gvfs_config_is_set(GVFS_MISSING_OK) &&
 	    !repo_has_object_file_with_flags(the_repository, oid,
 					     OBJECT_INFO_SKIP_FETCH_OBJECT |
 					     OBJECT_INFO_QUICK))
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
index afd77331040403..61bc5da66a9e1c 100755
--- a/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@ -349,6 +349,10 @@ test_expect_success "filter: smudge filters blocked when under GVFS" '
 	test_config filter.empty-in-repo.smudge "echo smudged && cat" &&
 	test_config core.gvfs 64 &&
 
+	test_must_fail git checkout &&
+
+	# ensure the local core.gvfs setting overwrites the global setting
+	git config --global core.gvfs false &&
 	test_must_fail git checkout
 '
 
diff --git a/t/t0400-pre-command-hook.sh b/t/t0400-pre-command-hook.sh
new file mode 100755
index 00000000000000..f2a9115e299385
--- /dev/null
+++ b/t/t0400-pre-command-hook.sh
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+test_description='pre-command hook'
+
+. ./test-lib.sh
+
+test_expect_success 'with no hook' '
+	echo "first" > file &&
+	git add file &&
+	git commit -m "first"
+'
+
+test_expect_success 'with succeeding hook' '
+	mkdir -p .git/hooks &&
+	write_script .git/hooks/pre-command <<-EOF &&
+	echo "\$*" | sed "s/ --git-pid=[0-9]*//" \
+		>\$(git rev-parse --git-dir)/pre-command.out
+	EOF
+	echo "second" >> file &&
+	git add file &&
+	test "add file" = "$(cat .git/pre-command.out)" &&
+	echo Hello | git hash-object --stdin &&
+	test "hash-object --stdin" = "$(cat .git/pre-command.out)"
+'
+
+test_expect_success 'with failing hook' '
+	write_script .git/hooks/pre-command <<-EOF &&
+	exit 1
+	EOF
+	echo "third" >> file &&
+	test_must_fail git add file &&
+	test_path_is_missing "$(cat .git/pre-command.out)"
+'
+
+test_expect_success 'in a subdirectory' '
+	echo touch i-was-here | write_script .git/hooks/pre-command &&
+	mkdir sub &&
+	(
+		cd sub &&
+		git version
+	) &&
+	test_path_is_file sub/i-was-here
+'
+
+test_expect_success 'in a subdirectory, using an alias' '
+	git reset --hard &&
+	echo "echo \"\$@; \$(pwd)\" >>log" |
+	write_script .git/hooks/pre-command &&
+	mkdir -p sub &&
+	(
+		cd sub &&
+		git -c alias.v="version" v
+	) &&
+	test_path_is_missing log &&
+	test_line_count = 2 sub/log
+'
+
+test_expect_success 'with core.hooksPath' '
+	mkdir -p .git/alternateHooks &&
+	write_script .git/alternateHooks/pre-command <<-EOF &&
+	echo "alternate" >\$(git rev-parse --git-dir)/pre-command.out
+	EOF
+	write_script .git/hooks/pre-command <<-EOF &&
+	echo "original"	>\$(git rev-parse --git-dir)/pre-command.out
+	EOF
+	git -c core.hooksPath=.git/alternateHooks status &&
+	test "alternate" = "$(cat .git/pre-command.out)"
+'
+test_done
diff --git a/t/t0401-post-command-hook.sh b/t/t0401-post-command-hook.sh
new file mode 100755
index 00000000000000..fcbfc4a0c79c1e
--- /dev/null
+++ b/t/t0401-post-command-hook.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+test_description='post-command hook'
+
+. ./test-lib.sh
+
+test_expect_success 'with no hook' '
+	echo "first" > file &&
+	git add file &&
+	git commit -m "first"
+'
+
+test_expect_success 'with succeeding hook' '
+	mkdir -p .git/hooks &&
+	write_script .git/hooks/post-command <<-EOF &&
+	echo "\$*" | sed "s/ --git-pid=[0-9]*//" \
+		>\$(git rev-parse --git-dir)/post-command.out
+	EOF
+	echo "second" >> file &&
+	git add file &&
+	test "add file --exit_code=0" = "$(cat .git/post-command.out)"
+'
+
+test_expect_success 'with failing pre-command hook' '
+	write_script .git/hooks/pre-command <<-EOF &&
+	exit 1
+	EOF
+	echo "third" >> file &&
+	test_must_fail git add file &&
+	test_path_is_missing "$(cat .git/post-command.out)"
+'
+
+test_done
diff --git a/t/t0402-block-command-on-gvfs.sh b/t/t0402-block-command-on-gvfs.sh
new file mode 100755
index 00000000000000..3ec7620ce6194d
--- /dev/null
+++ b/t/t0402-block-command-on-gvfs.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+test_description='block commands in GVFS repo'
+
+. ./test-lib.sh
+
+not_with_gvfs () {
+	command=$1 &&
+	shift &&
+	test_expect_success "test $command $*" "
+		test_config alias.g4rbled $command &&
+		test_config core.gvfs true &&
+		test_must_fail git $command $* &&
+		test_must_fail git g4rbled $* &&
+		test_unconfig core.gvfs &&
+		test_must_fail git -c core.gvfs=true $command $* &&
+		test_must_fail git -c core.gvfs=true g4rbled $*
+	"
+}
+
+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
+not_with_gvfs update-index --no-skip-worktree
+not_with_gvfs update-index --split-index
+not_with_gvfs worktree list
+
+test_expect_success 'test gc --auto succeeds when disabled via config' '
+	test_config core.gvfs true &&
+	test_config gc.auto 0 &&
+	git gc --auto
+'
+
+test_done
diff --git a/t/t7615-merge-sparse-checkout.sh b/t/t7615-merge-sparse-checkout.sh
new file mode 100755
index 00000000000000..5ce12431f62ad1
--- /dev/null
+++ b/t/t7615-merge-sparse-checkout.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+test_description='merge can handle sparse-checkout'
+
+. ./test-lib.sh
+
+# merges with conflicts
+
+test_expect_success 'setup' '
+	git branch -M main &&
+	test_commit a &&
+	test_commit file &&
+	git checkout -b delete-file &&
+	git rm file.t &&
+	test_tick &&
+	git commit -m "remove file" &&
+	git checkout main &&
+	test_commit modify file.t changed
+'
+
+test_expect_success 'merge conflict deleted file and modified' '
+	echo "/a.t" >.git/info/sparse-checkout &&
+	test_config core.sparsecheckout true &&
+	git checkout -f &&
+	test_path_is_missing file.t &&
+	test_must_fail git merge delete-file &&
+	test_path_is_file file.t &&
+	test "changed" = "$(cat file.t)"
+'
+
+test_done
diff --git a/unpack-trees.c b/unpack-trees.c
index edcc561d054779..d0d1fa20c00072 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -567,7 +567,9 @@ static int apply_sparse_checkout(struct index_state *istate,
 			ce->ce_flags &= ~CE_SKIP_WORKTREE;
 			return -1;
 		}
-		ce->ce_flags |= CE_WT_REMOVE;
+		if (!gvfs_config_is_set(GVFS_NO_DELETE_OUTSIDE_SPARSECHECKOUT))
+			ce->ce_flags |= CE_WT_REMOVE;
+
 		ce->ce_flags &= ~CE_UPDATE;
 	}
 	if (was_skip_worktree && !ce_skip_worktree(ce)) {