diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-07 06:05:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-07 06:05:27 (GMT) |
| commit | cba595ab1a7764aecfde2e8e59994f89b2cd2f2e (patch) | |
| tree | 832b23d5963d8931796fc3b9951e3708d1a40207 /builtin/fetch.c | |
| parent | 96e6547c2e4c137222c01582b52c0c974a02fd63 (diff) | |
| parent | 01f8d5948a7f370c42d9fe2deb724139a1bfcb7b (diff) | |
| download | git-cba595ab1a7764aecfde2e8e59994f89b2cd2f2e.zip git-cba595ab1a7764aecfde2e8e59994f89b2cd2f2e.tar.gz git-cba595ab1a7764aecfde2e8e59994f89b2cd2f2e.tar.bz2 | |
Merge branch 'jk/loose-object-cache-oid'
Code clean-up.
* jk/loose-object-cache-oid:
prefer "hash mismatch" to "sha1 mismatch"
sha1-file: avoid "sha1 file" for generic use in messages
sha1-file: prefer "loose object file" to "sha1 file" in messages
sha1-file: drop has_sha1_file()
convert has_sha1_file() callers to has_object_file()
sha1-file: convert pass-through functions to object_id
sha1-file: modernize loose header/stream functions
sha1-file: modernize loose object file functions
http: use struct object_id instead of bare sha1
update comment references to sha1_object_info()
sha1-file: fix outdated sha1 comment references
Diffstat (limited to 'builtin/fetch.c')
| -rw-r--r-- | builtin/fetch.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c index 39c4210..5a09fe2 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -317,8 +317,7 @@ static void find_non_local_tags(const struct ref *refs, !has_object_file_with_flags(&ref->old_oid, OBJECT_INFO_QUICK) && !will_fetch(head, ref->old_oid.hash) && - !has_sha1_file_with_flags(item->oid.hash, - OBJECT_INFO_QUICK) && + !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) && !will_fetch(head, item->oid.hash)) oidclr(&item->oid); item = NULL; @@ -332,7 +331,7 @@ static void find_non_local_tags(const struct ref *refs, * fetch. */ if (item && - !has_sha1_file_with_flags(item->oid.hash, OBJECT_INFO_QUICK) && + !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) && !will_fetch(head, item->oid.hash)) oidclr(&item->oid); @@ -353,7 +352,7 @@ static void find_non_local_tags(const struct ref *refs, * checked to see if it needs fetching. */ if (item && - !has_sha1_file_with_flags(item->oid.hash, OBJECT_INFO_QUICK) && + !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) && !will_fetch(head, item->oid.hash)) oidclr(&item->oid); |