diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-02-14 21:54:22 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-14 21:54:22 +0100 |
| commit | 78e67cda42a440f216fc4cbfd8a9e190c5eece5a (patch) | |
| tree | 6e1f8349af8dc8ba249a6fd9f4367ef8e983a55d /convert.c | |
| parent | Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing' (diff) | |
| parent | sha1-file: allow check_object_signature() to handle any repo (diff) | |
| download | git-78e67cda42a440f216fc4cbfd8a9e190c5eece5a.tar.xz git-78e67cda42a440f216fc4cbfd8a9e190c5eece5a.zip | |
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 'convert.c')
| -rw-r--r-- | convert.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1146,7 +1146,7 @@ static int ident_to_worktree(const char *src, size_t len, /* are we "faking" in place editing ? */ if (src == buf->buf) to_free = strbuf_detach(buf, NULL); - hash_object_file(src, len, "blob", &oid); + hash_object_file(the_hash_algo, src, len, "blob", &oid); strbuf_grow(buf, len + cnt * (the_hash_algo->hexsz + 3)); for (;;) { |