diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-15 14:55:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-15 14:55:43 -0800 |
| commit | 8be8342b4c47df386c6eced39922595d7dfdccc9 (patch) | |
| tree | 3fed16dd1602125435cf12a4c150698bb13bdf59 /merge-recursive.c | |
| parent | 157ee050615192d579a358723563e7f785d676ff (diff) | |
| parent | 1752cbbc447c08230c478239e185db9fa2d4a515 (diff) | |
| download | git-8be8342b4c47df386c6eced39922595d7dfdccc9.tar.gz | |
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 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 9d53f30111..6ff971f9a2 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1028,8 +1028,9 @@ static int merge_file_1(struct merge_options *o, if ((merge_status < 0) || !result_buf.ptr) ret = err(o, _("Failed to execute internal merge")); - if (!ret && write_sha1_file(result_buf.ptr, result_buf.size, - blob_type, result->oid.hash)) + if (!ret && + write_object_file(result_buf.ptr, result_buf.size, + blob_type, &result->oid)) ret = err(o, _("Unable to add %s to database"), a->path); |