From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Mar 2018 22:10:58 +0000 (-0700)
Subject: Merge branch 'jh/fsck-promisors' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0c283dbe5e6bb6aa3da95dba4e7a2ba202893c6a?hp=13eb4e2d8b3320e9b83854ad3f89f54febcb0540

Merge branch 'jh/fsck-promisors' into next

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 89a8c1bad0..669aadf2e0 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1263,9 +1263,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 &&