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

Signed-off-by: Derrick Stolee <stolee@gmail.com>

Author: derrickstolee

gvfs-helper-client.c

@@ -250,7 +250,6 @@ static int gh_client__objects__receive_response(
 		}
 
 		else if (starts_with(line, "packfile")) {
-			gh_client__update_packed_git(line);
 			ghc |= GHC__CREATED__PACKFILE;
 			nr_packfile++;
 		}
@@ -271,6 +270,9 @@ static int gh_client__objects__receive_response(
 		}
 	}
 
+	if (ghc & GHC__CREATED__PACKFILE)
+		packfile_store_reprepare(the_repository->objects->packfiles);
+
 	*p_ghc = ghc;
 	*p_nr_loose = nr_loose;
 	*p_nr_packfile = nr_packfile;

t/t5799-gvfs-helper.sh

@@ -1285,15 +1285,30 @@ test_expect_success 'integration: explicit commit/trees, implicit blobs: diff 2
 		>OUT.output 2>OUT.stderr
 '
 
+trace_has_queue_oid () {
+	oid=$1
+	grep "gh_client__queue_oid: $oid"
+}
+
+trace_has_immediate_oid () {
+	oid=$1
+	grep "gh_client__get_immediate: $oid"
+}
+
 test_expect_success 'integration: fully implicit: diff 2 commits' '
 	test_when_finished "per_test_cleanup" &&
 	start_gvfs_protocol_server &&
 
 	# Implicitly demand-load everything without any pre-seeding.
 	#
+	GIT_TRACE2_EVENT="$(pwd)/diff-trace.txt" \
 	git -C "$REPO_T1" -c core.useGVFSHelper=true \
 		diff $(cat m1.branch)..$(cat m3.branch) \
-		>OUT.output 2>OUT.stderr
+		>OUT.output 2>OUT.stderr &&
+
+	oid=$(git -C "$REPO_SRC" rev-parse main:file9.txt.t) &&
+	trace_has_queue_oid $oid <diff-trace.txt &&
+	! trace_has_immediate_oid $oid <diff-trace.txt
 '
 
 # T1 should be considered contaminated at this point.