From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Mar 2018 18:30:10 +0000 (-0700)
Subject: Merge branch 'jh/fsck-promisors'
X-Git-Tag: v2.17.0-rc1~12
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/649406644dc94caec3e3f2499a1786daffd90231?hp=beb2cdf5041104a7513301a9b20944a617eec94e

Merge branch 'jh/fsck-promisors'

A hotfix to a topic that graduated recently.

* jh/fsck-promisors:
sha1_file: restore OBJECT_INFO_QUICK functionality
---

diff --git a/sha1_file.c b/sha1_file.c
index 1b94f39c4c..cc0f43ea84 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1267,9 +1267,11 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi,
 			return 0;
 
 		/* Not a loose object; someone else may have just packed it. */
-		reprepare_packed_git();
-		if (find_pack_entry(real, &e))
-			break;
+		if (!(flags & OBJECT_INFO_QUICK)) {
+			reprepare_packed_git();
+			if (find_pack_entry(real, &e))
+				break;
+		}
 
 		/* Check if it is a missing object */
 		if (fetch_if_missing && repository_format_partial_clone &&