Merge branch 'cb/windows-manifest'

diff --git a/sha1-file.c b/sha1-file.c
index ed5c50dac427f2f3aa2b9b7b203bf2355049b163..888b6024d5de050753765e37b65ea0521d91f9fd 100644 (file)
--- a/sha1-file.c
+++ b/sha1-file.c
@@ -1379,7 +1379,7 @@ 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 &&
-                   !(flags & OBJECT_INFO_FOR_PREFETCH)) {
+                   !(flags & OBJECT_INFO_SKIP_FETCH_OBJECT)) {
                        /*
                         * TODO Investigate having fetch_object() return
                         * TODO error/success and stopping the music here.