diff options
| author | Patryk Obara <patryk.obara@gmail.com> | 2018-01-28 00:13:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-30 18:42:36 (GMT) |
| commit | a09c985eae694db1cf31c72db0e2e1bf42f1274f (patch) | |
| tree | 3acdfc26ab59d2ac822e4b4cf6ad93bf746fb65d /builtin/checkout.c | |
| parent | bbca96d579b31900c9c0ad39299a3c9a3bd276f9 (diff) | |
| download | git-a09c985eae694db1cf31c72db0e2e1bf42f1274f.zip git-a09c985eae694db1cf31c72db0e2e1bf42f1274f.tar.gz git-a09c985eae694db1cf31c72db0e2e1bf42f1274f.tar.bz2 | |
sha1_file: convert write_sha1_file to object_id
Convert the definition and declaration of write_sha1_file to
struct object_id and adjust usage of this function.
This commit also converts static function write_sha1_file_prepare, as it
is closely related.
Rename these functions to write_object_file and
write_object_file_prepare respectively.
Replace sha1_to_hex, hashcpy and hashclr with their oid equivalents
wherever possible.
Signed-off-by: Patryk Obara <patryk.obara@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index c54c78d..191b96c 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -227,8 +227,7 @@ static int checkout_merged(int pos, const struct checkout *state) * (it also writes the merge result to the object database even * when it may contain conflicts). */ - if (write_sha1_file(result_buf.ptr, result_buf.size, - blob_type, oid.hash)) + if (write_object_file(result_buf.ptr, result_buf.size, blob_type, &oid)) die(_("Unable to add merge result for '%s'"), path); free(result_buf.ptr); ce = make_cache_entry(mode, oid.hash, path, 2, 0); |