diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-02-07 09:05:27 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-02-07 09:05:27 +0300 |
commit | cba595ab1a7764aecfde2e8e59994f89b2cd2f2e (patch) | |
tree | 832b23d5963d8931796fc3b9951e3708d1a40207 /send-pack.c | |
parent | 96e6547c2e4c137222c01582b52c0c974a02fd63 (diff) | |
parent | 01f8d5948a7f370c42d9fe2deb724139a1bfcb7b (diff) |
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 'send-pack.c')
-rw-r--r-- | send-pack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/send-pack.c b/send-pack.c index 7b9829f165..6dc16c3211 100644 --- a/send-pack.c +++ b/send-pack.c @@ -40,7 +40,7 @@ int option_parse_push_signed(const struct option *opt, static void feed_object(const struct object_id *oid, FILE *fh, int negative) { - if (negative && !has_sha1_file(oid->hash)) + if (negative && !has_object_file(oid)) return; if (negative) |