diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-03-17 00:53:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-03-17 00:53:08 (GMT) |
| commit | 430883a70c79614e52279f2800a9a383ffc68fe5 (patch) | |
| tree | 84a13eeaaa7f7231a55f02cb48d42c5951197fa5 /merge-ort.c | |
| parent | 8d1ae40bae1568be25dcc55679f1635b90d53d1b (diff) | |
| parent | 6aea6baeb3ece6c832dbdf1deed09f41aebf85c2 (diff) | |
| download | git-430883a70c79614e52279f2800a9a383ffc68fe5.zip git-430883a70c79614e52279f2800a9a383ffc68fe5.tar.gz git-430883a70c79614e52279f2800a9a383ffc68fe5.tar.bz2 | |
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 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-ort.c b/merge-ort.c index 97da477..dc3fc0e 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -1938,7 +1938,7 @@ static int handle_content_merge(struct merge_options *opt, if (!ret && write_object_file(result_buf.ptr, result_buf.size, - blob_type, &result->oid)) + OBJ_BLOB, &result->oid)) ret = err(opt, _("Unable to add %s to database"), path); @@ -3392,7 +3392,7 @@ static void write_tree(struct object_id *result_oid, } /* Write this object file out, and record in result_oid */ - write_object_file(buf.buf, buf.len, tree_type, result_oid); + write_object_file(buf.buf, buf.len, OBJ_TREE, result_oid); strbuf_release(&buf); } |