diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-02-05 00:48:32 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2022-02-25 17:16:32 -0800 |
| commit | 44439c1c5827480f68b37c3cc38f257eaeb3ed2c (patch) | |
| tree | 405962dbb5c68dbc18a2082a066c75a21a669b1d /builtin/merge-ours.c | |
| parent | object API: rename hash_object_file_literally() to write_*() (diff) | |
| download | tgif-44439c1c5827480f68b37c3cc38f257eaeb3ed2c.tar.xz | |
object-file API: have hash_object_file() take "enum object_type"
Change the hash_object_file() function to take an "enum
object_type".
Since a preceding commit all of its callers are passing either
"{commit,tree,blob,tag}_type", or the result of a call to type_name(),
the parse_object() caller that would pass NULL is now using
stream_object_signature().
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions