diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-02-14 12:54:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-14 12:54:22 -0800 |
| commit | 78e67cda42a440f216fc4cbfd8a9e190c5eece5a (patch) | |
| tree | 6e1f8349af8dc8ba249a6fd9f4367ef8e983a55d /builtin/fast-export.c | |
| parent | Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing' (diff) | |
| parent | sha1-file: allow check_object_signature() to handle any repo (diff) | |
| download | tgif-78e67cda42a440f216fc4cbfd8a9e190c5eece5a.tar.xz | |
Merge branch 'mt/use-passed-repo-more-in-funcs'
Some codepaths were given a repository instance as a parameter to
work in the repository, but passed the_repository instance to its
callees, which has been cleaned up (somewhat).
* mt/use-passed-repo-more-in-funcs:
sha1-file: allow check_object_signature() to handle any repo
sha1-file: pass git_hash_algo to hash_object_file()
sha1-file: pass git_hash_algo to write_object_file_prepare()
streaming: allow open_istream() to handle any repo
pack-check: use given repo's hash_algo at verify_packfile()
cache-tree: use given repo's hash_algo at verify_one()
diff: make diff_populate_filespec() honor its repo argument
Diffstat (limited to 'builtin/fast-export.c')
| -rw-r--r-- | builtin/fast-export.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 164406fdd4..85868162ee 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -293,7 +293,8 @@ static void export_blob(const struct object_id *oid) buf = read_object_file(oid, &type, &size); if (!buf) die("could not read blob %s", oid_to_hex(oid)); - if (check_object_signature(oid, buf, size, type_name(type)) < 0) + if (check_object_signature(the_repository, oid, buf, size, + type_name(type)) < 0) die("oid mismatch in blob %s", oid_to_hex(oid)); object = parse_object_buffer(the_repository, oid, type, size, buf, &eaten); |