apply: do not lazy fetch when applying binary

jonathantanmy · gitster · commit 3318238db949 · 2020-08-06T13:01:02.000-07:00
When applying a binary patch, as an optimization, "apply" checks if the
postimage is already present. During this fetch, it is perfectly
expected for the postimage not to be present, so there is no need to
lazy-fetch missing objects. Teach "apply" not to lazy-fetch in this
case.

Signed-off-by: Jonathan Tan &lt;jonathantanmy@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/apply.c b/apply.c
@@ -3178,7 +3178,7 @@ static int apply_binary(struct apply_state *state,
 		return 0; /* deletion patch */
 	}
 
-	if (has_object_file(&oid)) {
+	if (has_object(the_repository, &oid, 0)) {
 		/* We already have the postimage */
 		enum object_type type;
 		unsigned long size;
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
@@ -1133,4 +1133,20 @@ test_expect_success 'am and .gitattibutes' '
 	)
 '
 
+test_expect_success 'apply binary blob in partial clone' '
+	printf "\\000" >binary &&
+	git add binary &&
+	git commit -m "binary blob" &&
+	git format-patch --stdout -m HEAD^ >patch &&
+
+	test_create_repo server &&
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	git clone --filter=blob:none "file://$(pwd)/server" client &&
+	test_when_finished "rm -rf client" &&
+
+	# Exercise to make sure that it works
+	git -C client am ../patch
+'
+
 test_done

Original file line number	Diff line number	Diff line change
`@@ -3178,7 +3178,7 @@ static int apply_binary(struct apply_state *state,`
`3178`	`3178`	`return 0; /* deletion patch */`
`3179`	`3179`	`}`
`3180`	`3180`
`3181`		`- if (has_object_file(&oid)) {`
	`3181`	`+ if (has_object(the_repository, &oid, 0)) {`
`3182`	`3182`	`/* We already have the postimage */`
`3183`	`3183`	`enum object_type type;`
`3184`	`3184`	`unsigned long size;`