diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-06-17 17:15:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-17 17:15:14 (GMT) |
| commit | 5d5c46b28c04348f7b680e5fe007c6344a86a70a (patch) | |
| tree | ecb93914f4ecf98aadce766bf0a30c05cd8d2fa9 /sha1-file.c | |
| parent | 0aae918dd929862d3ce0ea2960897787bb269a3b (diff) | |
| parent | 31f5256c82a36edea3ea2f91e5171e3472878915 (diff) | |
| download | git-5d5c46b28c04348f7b680e5fe007c6344a86a70a.zip git-5d5c46b28c04348f7b680e5fe007c6344a86a70a.tar.gz git-5d5c46b28c04348f7b680e5fe007c6344a86a70a.tar.bz2 | |
Merge branch 'ds/object-info-for-prefetch-fix'
Code cleanup and futureproof.
* ds/object-info-for-prefetch-fix:
sha1-file: split OBJECT_INFO_FOR_PREFETCH
Diffstat (limited to 'sha1-file.c')
| -rw-r--r-- | sha1-file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1-file.c b/sha1-file.c index ed5c50d..888b602 100644 --- a/sha1-file.c +++ b/sha1-file.c @@ -1379,7 +1379,7 @@ int oid_object_info_extended(struct repository *r, const struct object_id *oid, /* Check if it is a missing object */ if (fetch_if_missing && repository_format_partial_clone && !already_retried && r == the_repository && - !(flags & OBJECT_INFO_FOR_PREFETCH)) { + !(flags & OBJECT_INFO_SKIP_FETCH_OBJECT)) { /* * TODO Investigate having fetch_object() return * TODO error/success and stopping the music here. |