sha1_file: when writing objects, skip the read_object_hook

If we are going to write an object there is no use in calling
the read object hook to get an object from a potentially remote
source.  We would rather just write out the object and avoid the
potential round trip for an object that doesn't exist.

This change adds a flag to the check_and_freshen() and
freshen_loose_object() functions' signatures so that the hook
is bypassed when the functions are called before writing loose
objects. The check for a local object is still performed so we
don't overwrite something that has already been written to one
of the objects directories.

Based on a patch by Kevin Willford.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Author: dscho

object-file.c

@@ -93,15 +93,16 @@ int check_and_freshen_file(const char *fn, int freshen)
 
 static int check_and_freshen_source(struct odb_source *source,
 				    const struct object_id *oid,
-				    int freshen)
+				    int freshen, int skip_virtualized_objects)
 {
 	static struct strbuf path = STRBUF_INIT;
 	int ret, tried_hook = 0;
 
 	odb_loose_path(source, &path, oid);
 retry:
 	ret = check_and_freshen_file(path.buf, freshen);
-	if (!ret && gvfs_virtualize_objects(source->odb->repo) && !tried_hook) {
+	if (!ret && gvfs_virtualize_objects(source->odb->repo) &&
+	    !skip_virtualized_objects && !tried_hook) {
 		tried_hook = 1;
 		if (!read_object_process(source->odb->repo, oid))
 			goto retry;
@@ -112,7 +113,7 @@ static int check_and_freshen_source(struct odb_source *source,
 int odb_source_loose_has_object(struct odb_source *source,
 				const struct object_id *oid)
 {
-	return check_and_freshen_source(source, oid, 0);
+	return check_and_freshen_source(source, oid, 0, 0);
 }
 
 int format_object_header(char *str, size_t size, enum object_type type,
@@ -1029,9 +1030,10 @@ static int write_loose_object(struct odb_source *source,
 }
 
 int odb_source_loose_freshen_object(struct odb_source *source,
-				    const struct object_id *oid)
+				    const struct object_id *oid,
+				    int skip_virtualized_objects)
 {
-	return !!check_and_freshen_source(source, oid, 1);
+	return !!check_and_freshen_source(source, oid, 1, skip_virtualized_objects);
 }
 
 int odb_source_loose_write_stream(struct odb_source *source,
@@ -1113,7 +1115,7 @@ int odb_source_loose_write_stream(struct odb_source *source,
 		die(_("deflateEnd on stream object failed (%d)"), ret);
 	close_loose_object(source, fd, tmp_file.buf);
 
-	if (odb_freshen_object(source->odb, oid)) {
+	if (odb_freshen_object(source->odb, oid, 1)) {
 		unlink_or_warn(tmp_file.buf);
 		goto cleanup;
 	}
@@ -1175,7 +1177,7 @@ int odb_source_loose_write_object(struct odb_source *source,
 	 * it out into .git/objects/??/?{38} file.
 	 */
 	write_object_file_prepare(algo, buf, len, type, oid, hdr, &hdrlen);
-	if (odb_freshen_object(source->odb, oid))
+	if (odb_freshen_object(source->odb, oid, 1))
 		return 0;
 	if (write_loose_object(source, oid, hdr, hdrlen, buf, len, 0, flags))
 		return -1;

object-file.h

@@ -62,7 +62,8 @@ int odb_source_loose_has_object(struct odb_source *source,
 				const struct object_id *oid);
 
 int odb_source_loose_freshen_object(struct odb_source *source,
-				    const struct object_id *oid);
+				    const struct object_id *oid,
+				    int skip_virtualized_objects);
 
 int odb_source_loose_write_object(struct odb_source *source,
 				  const void *buf, size_t len,

odb.c

@@ -1105,7 +1105,8 @@ int odb_has_object(struct object_database *odb, const struct object_id *oid,
 }
 
 int odb_freshen_object(struct object_database *odb,
-		       const struct object_id *oid)
+		       const struct object_id *oid,
+		       int skip_virtualized_objects)
 {
 	struct odb_source *source;
 
@@ -1114,7 +1115,7 @@ int odb_freshen_object(struct object_database *odb,
 		if (packfile_store_freshen_object(source->packfiles, oid))
 			return 1;
 
-		if (odb_source_loose_freshen_object(source, oid))
+		if (odb_source_loose_freshen_object(source, oid, skip_virtualized_objects))
 			return 1;
 	}
 

odb.h

@@ -405,7 +405,8 @@ int odb_has_object(struct object_database *odb,
 		   unsigned flags);
 
 int odb_freshen_object(struct object_database *odb,
-		       const struct object_id *oid);
+		       const struct object_id *oid,
+		       int skip_virtualized_objects);
 
 void odb_assert_oid_type(struct object_database *odb,
 			 const struct object_id *oid, enum object_type expect);

t/t0410/read-object

@@ -108,6 +108,10 @@ while (1) {
 		system ('git --git-dir="' . $DIR . '" cat-file blob ' . $sha1 . ' | git -c core.virtualizeobjects=false hash-object -w --stdin >/dev/null 2>&1');
 		packet_txt_write(($?) ? "status=error" : "status=success");
 		packet_flush();
+
+		open my $log, '>>.git/read-object-hook.log';
+		print $log "Read object $sha1, exit code $?\n";
+		close $log;
 	} else {
 		die "bad command '$command'";
 	}

t/t0499-read-object.sh

@@ -26,5 +26,12 @@ test_expect_success 'invalid blobs generate errors' '
 	 test_must_fail git cat-file blob "invalid")
 '
 
+test_expect_success 'read-object-hook is bypassed when writing objects' '
+	(cd guest-repo &&
+	 echo hello >hello.txt &&
+	 git add hello.txt &&
+	 hash="$(git rev-parse --verify :hello.txt)" &&
+	 ! grep "$hash" .git/read-object-hook.log)
+'
 
 test_done