Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jh/fsck-promisors'
author
Junio C Hamano
<gitster@pobox.com>
Wed, 21 Mar 2018 18:30:10 +0000
(11:30 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 21 Mar 2018 18:30:10 +0000
(11:30 -0700)
A hotfix to a topic that graduated recently.
* jh/fsck-promisors:
sha1_file: restore OBJECT_INFO_QUICK functionality
sha1_file.c
patch
|
blob
|
history
raw
(from parent 1:
beb2cdf
)
diff --git
a/sha1_file.c
b/sha1_file.c
index 1b94f39c4c5653b090d5dbecf0cf7a785b0556bb..cc0f43ea849569664d1af9fe05a6b42917990a7f 100644
(file)
--- 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 &&