fixup! gvfs-helper: create tool to fetch objects using the GVFS Protocol

Author: derrickstolee

builtin/index-pack.c

@@ -1352,7 +1352,7 @@ static void fix_unresolved_deltas(struct hashfile *f)
 		sorted_by_pos[i] = &ref_deltas[i];
 	QSORT(sorted_by_pos, nr_ref_deltas, delta_pos_compare);
 
-	if (has_promisor_remote() || core_use_gvfs_helper) {
+	if (has_promisor_remote()) {
 		/*
 		 * Prefetch the delta bases.
 		 */

diff.c

@@ -6504,8 +6504,7 @@ static void add_if_missing(struct repository *r,
 
 void diffcore_std(struct diff_options *options)
 {
-	if (options->repo == the_repository &&
-	    (has_promisor_remote() || core_use_gvfs_helper)) {
+	if (options->repo == the_repository && has_promisor_remote()) {
 		/*
 		 * Prefetch the diff pairs that are about to be flushed.
 		 */

promisor-remote.c

@@ -41,13 +41,6 @@ static int fetch_objects(const char *remote_name,
 	struct ref *ref = NULL;
 	int i;
 
-	if (core_use_gvfs_helper) {
-		enum gh_client__created ghc = GHC__CREATED__NOTHING;
-
-		gh_client__queue_oid_array(oids, oid_nr);
-		gh_client__drain_queue(&ghc);
-		return 0;
-	}
 
 	for (i = 0; i < oid_nr; i++) {
 		struct ref *new_ref = alloc_ref(oid_to_hex(&oids[i]));
@@ -208,7 +201,7 @@ struct promisor_remote *promisor_remote_find(const char *remote_name)
 
 int has_promisor_remote(void)
 {
-	return !!promisor_remote_find(NULL);
+	return core_use_gvfs_helper || !!promisor_remote_find(NULL);
 }
 
 static int remove_fetched_oids(struct repository *repo,
@@ -253,6 +246,14 @@ int promisor_remote_get_direct(struct repository *repo,
 	int to_free = 0;
 	int res = -1;
 
+	if (core_use_gvfs_helper) {
+		enum gh_client__created ghc = GHC__CREATED__NOTHING;
+
+		trace2_data_intmax("bug", the_repository, "fetch_objects/gvfs-helper", oid_nr);
+		gh_client__queue_oid_array(oids, oid_nr);
+		return gh_client__drain_queue(&ghc);
+	}
+
 	promisor_remote_init();
 
 	for (r = promisors; r; r = r->next) {

unpack-trees.c

@@ -408,8 +408,7 @@ static int check_updates(struct unpack_trees_options *o)
 		load_gitmodules_file(index, &state);
 
 	enable_delayed_checkout(&state);
-	if ((has_promisor_remote() || core_use_gvfs_helper) &&
-	    o->update && !o->dry_run) {
+	if (has_promisor_remote() && o->update && !o->dry_run) {
 		/*
 		 * Prefetch the objects that are to be checked out in the loop
 		 * below.