diff options
| author | Patrick Steinhardt <ps@pks.im> | 2024-06-14 08:50:18 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-06-14 10:26:33 -0700 |
| commit | 7abbca0e7470d1f7b6973933358c17022c6ee8a1 (patch) | |
| tree | ca407e02f2c2e189f1e250ae7b8e964dbb409210 /builtin/merge.c | |
| parent | 9c34eb93fba703e74f06d20f5b36a1a5e3dc6486 (diff) | |
hash: require hash algorithm in `empty_tree_oid_hex()`
The `empty_tree_oid_hex()` function use `the_repository` to derive the
hash function that shall be used. Require callers to pass in the hash
algorithm to get rid of this implicit dependency.
While at it, remove the unused `empty_blob_oid_hex()` function.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index abe66311c7..bb94b7df21 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -330,7 +330,8 @@ static void read_empty(const struct object_id *oid) { struct child_process cmd = CHILD_PROCESS_INIT; - strvec_pushl(&cmd.args, "read-tree", "-m", "-u", empty_tree_oid_hex(), + strvec_pushl(&cmd.args, "read-tree", "-m", "-u", + empty_tree_oid_hex(the_repository->hash_algo), oid_to_hex(oid), NULL); cmd.git_cmd = 1; |