Merge branch 'nd/init-relative-template-fix' into maint

[thirdparty/git.git] / sha1-file.c

diff --git a/sha1-file.c b/sha1-file.c
index bcd9470bce089012ab942973cd841262d35749eb..ed5c50dac427f2f3aa2b9b7b203bf2355049b163 100644 (file)
--- a/sha1-file.c
+++ b/sha1-file.c
@@ -1378,7 +1378,8 @@ int oid_object_info_extended(struct repository *r, const struct object_id *oid,
 
                /* Check if it is a missing object */
                if (fetch_if_missing && repository_format_partial_clone &&
-                   !already_retried && r == the_repository) {
+                   !already_retried && r == the_repository &&
+                   !(flags & OBJECT_INFO_FOR_PREFETCH)) {
                        /*
                         * TODO Investigate having fetch_object() return
                         * TODO error/success and stopping the music here.