diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-02-16 01:55:43 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-02-16 01:55:43 +0300 |
commit | 8be8342b4c47df386c6eced39922595d7dfdccc9 (patch) | |
tree | 3fed16dd1602125435cf12a4c150698bb13bdf59 /sequencer.c | |
parent | 157ee050615192d579a358723563e7f785d676ff (diff) | |
parent | 1752cbbc447c08230c478239e185db9fa2d4a515 (diff) |
Merge branch 'po/object-id'
Conversion from uchar[20] to struct object_id continues.
* po/object-id:
sha1_file: rename hash_sha1_file_literally
sha1_file: convert write_loose_object to object_id
sha1_file: convert force_object_loose to object_id
sha1_file: convert write_sha1_file to object_id
notes: convert write_notes_tree to object_id
notes: convert combine_notes_* to object_id
commit: convert commit_tree* to object_id
match-trees: convert splice_tree to object_id
cache: clear whole hash buffer with oidclr
sha1_file: convert hash_sha1_file to object_id
dir: convert struct sha1_stat to use object_id
sha1_file: convert pretend_sha1_file to object_id
Diffstat (limited to 'sequencer.c')
-rw-r--r-- | sequencer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sequencer.c b/sequencer.c index 5bfdc40442..e9baaf59bd 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1149,8 +1149,8 @@ static int try_to_commit(struct strbuf *msg, const char *author, goto out; } - if (commit_tree_extended(msg->buf, msg->len, tree.hash, parents, - oid->hash, author, opts->gpg_sign, extra)) { + if (commit_tree_extended(msg->buf, msg->len, &tree, parents, + oid, author, opts->gpg_sign, extra)) { res = error(_("failed to write commit object")); goto out; } |