mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 20:53:55 +01:00
Code

Merge branch 'jh/fsck-promisors'

Browse Source 
A hotfix to a topic that graduated recently.

* jh/fsck-promisors:
  sha1_file: restore OBJECT_INFO_QUICK functionality
This commit is contained in:
Junio C Hamano 2018-03-21 11:30:10 -07:00
commit 649406644d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sha1_file.c
View File

@ -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 &&