fixup! maintenance: care about gvfs.sharedCache config

Author: mjcheetham

builtin/gc.c

@@ -1141,17 +1141,19 @@ static int write_loose_object_to_stdin(const struct object_id *oid,
 	return ++(d->count) > d->batch_size;
 }
 
-static const char *object_dir = NULL;
+static const char *vfs_object_dir = NULL;
 
 static int pack_loose(struct maintenance_run_opts *opts)
 {
 	struct repository *r = the_repository;
 	int result = 0;
 	struct write_loose_object_data data;
 	struct child_process pack_proc = CHILD_PROCESS_INIT;
+	const char *object_dir = r->objects->odb->path;
 
-	if (!object_dir)
-		object_dir = r->objects->odb->path;
+	/* If set, use the VFS object directory. */
+	if (vfs_object_dir)
+		object_dir = vfs_object_dir;
 
 	/*
 	 * Do not start pack-objects process
@@ -1620,8 +1622,8 @@ static int maintenance_run(int argc, const char **argv, const char *prefix)
 	 */
 	if (!git_config_get_value("gvfs.sharedcache", &tmp_obj_dir) &&
 	    tmp_obj_dir) {
-		object_dir = xstrdup(tmp_obj_dir);
-		setenv(DB_ENVIRONMENT, object_dir, 1);
+		vfs_object_dir = xstrdup(tmp_obj_dir);
+		setenv(DB_ENVIRONMENT, vfs_object_dir, 1);
 	}
 
 	ret = maintenance_run_tasks(&opts, &cfg);