Merge branch 'jh/fsck-promisors'

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
Родитель beb2cdf504 2b7750c923
Коммит 649406644d
1 изменённых файлов: 5 добавлений и 3 удалений

Просмотреть файл

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