Merge branch 'bw/c-plus-plus' into ds/lazy-load-trees

diff --git a/builtin/checkout.c b/builtin/checkout.c
index ed3d655f2a09a27e226277125d705844411774a9..a52af2e50705312a6d42df8667bbe4f5dfab8c86 100644 (file)
--- 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);