diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-03-16 17:53:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-03-16 17:53:08 -0700 |
| commit | 430883a70c79614e52279f2800a9a383ffc68fe5 (patch) | |
| tree | 84a13eeaaa7f7231a55f02cb48d42c5951197fa5 /log-tree.c | |
| parent | 8d1ae40bae1568be25dcc55679f1635b90d53d1b (diff) | |
| parent | 6aea6baeb3ece6c832dbdf1deed09f41aebf85c2 (diff) | |
| download | git-430883a70c79614e52279f2800a9a383ffc68fe5.tar.gz | |
Merge branch 'ab/object-file-api-updates'
Object-file API shuffling.
* ab/object-file-api-updates:
object-file API: pass an enum to read_object_with_reference()
object-file.c: add a literal version of write_object_file_prepare()
object-file API: have hash_object_file() take "enum object_type"
object API: rename hash_object_file_literally() to write_*()
object-file API: split up and simplify check_object_signature()
object API users + docs: check <0, not !0 with check_object_signature()
object API docs: move check_object_signature() docs to cache.h
object API: correct "buf" v.s. "map" mismatch in *.c and *.h
object-file API: have write_object_file() take "enum object_type"
object-file API: add a format_object_header() function
object-file API: return "void", not "int" from hash_object_file()
object-file.c: split up declaration of unrelated variables
Diffstat (limited to 'log-tree.c')
| -rw-r--r-- | log-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/log-tree.c b/log-tree.c index 25165e2a91..38e5cccc1a 100644 --- a/log-tree.c +++ b/log-tree.c @@ -565,7 +565,7 @@ static int show_one_mergetag(struct commit *commit, struct strbuf signature = STRBUF_INIT; hash_object_file(the_hash_algo, extra->value, extra->len, - type_name(OBJ_TAG), &oid); + OBJ_TAG, &oid); tag = lookup_tag(the_repository, &oid); if (!tag) return -1; /* error message already given */ |