object-file: drop support for writing objects with unknown types

Since "hash-object --literally" no longer supports objects with unknown
types, there are now no callers of write_object_file_literally() and its
helpers. Let's drop them to simplify the code.

In particular, this gets rid of some ugly copy-and-paste code from
write_object_file_literally(), which is a parallel implementation of
write_object_file(). When the split was originally made, the two weren't
that long, but commits like 63a6745a07 (object-file: update the loose
object map when writing loose objects, 2023-10-01) ended up having to
duplicate some tricky code.

This patch drops all of that duplication and should make things less
error-prone going forward.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/object-file.c b/object-file.c
index b10e28352913c2c212ecb06804f490060daa4908..1ac04c2891634afba14b49e2307879ec4fd368e6 100644 (file)
--- a/object-file.c
+++ b/object-file.c
@@ -130,12 +130,6 @@ int has_loose_object(const struct object_id *oid)
        return check_and_freshen(oid, 0);
 }
 
-static int format_object_header_literally(char *str, size_t size,
-                                         const char *type, size_t objsize)
-{
-       return xsnprintf(str, size, "%s %"PRIuMAX, type, (uintmax_t)objsize) + 1;
-}
-
 int format_object_header(char *str, size_t size, enum object_type type,
                         size_t objsize)
 {
@@ -144,7 +138,7 @@ int format_object_header(char *str, size_t size, enum object_type type,
        if (!name)
                BUG("could not get a type name for 'enum object_type' value %d", type);
 
-       return format_object_header_literally(str, size, name, objsize);
+       return xsnprintf(str, size, "%s %"PRIuMAX, name, (uintmax_t)objsize) + 1;
 }
 
 int check_object_signature(struct repository *r, const struct object_id *oid,
@@ -558,17 +552,6 @@ static void write_object_file_prepare(const struct git_hash_algo *algo,
        hash_object_body(algo, &c, buf, len, oid, hdr, hdrlen);
 }
 
-static void write_object_file_prepare_literally(const struct git_hash_algo *algo,
-                                     const void *buf, unsigned long len,
-                                     const char *type, struct object_id *oid,
-                                     char *hdr, int *hdrlen)
-{
-       struct git_hash_ctx c;
-
-       *hdrlen = format_object_header_literally(hdr, *hdrlen, type, len);
-       hash_object_body(algo, &c, buf, len, oid, hdr, hdrlen);
-}
-
 #define CHECK_COLLISION_DEST_VANISHED -2
 
 static int check_collision(const char *source, const char *dest)
@@ -698,21 +681,14 @@ out:
        return 0;
 }
 
-static void hash_object_file_literally(const struct git_hash_algo *algo,
-                                      const void *buf, unsigned long len,
-                                      const char *type, struct object_id *oid)
-{
-       char hdr[MAX_HEADER_LEN];
-       int hdrlen = sizeof(hdr);
-
-       write_object_file_prepare_literally(algo, buf, len, type, oid, hdr, &hdrlen);
-}
-
 void hash_object_file(const struct git_hash_algo *algo, const void *buf,
                      unsigned long len, enum object_type type,
                      struct object_id *oid)
 {
-       hash_object_file_literally(algo, buf, len, type_name(type), oid);
+       char hdr[MAX_HEADER_LEN];
+       int hdrlen = sizeof(hdr);
+
+       write_object_file_prepare(algo, buf, len, type, oid, hdr, &hdrlen);
 }
 
 /* Finalize a file on disk, and close it. */
@@ -1114,53 +1090,6 @@ int write_object_file_flags(const void *buf, unsigned long len,
        return 0;
 }
 
-int write_object_file_literally(const void *buf, unsigned long len,
-                               const char *type, struct object_id *oid,
-                               unsigned flags)
-{
-       char *header;
-       struct repository *repo = the_repository;
-       const struct git_hash_algo *algo = repo->hash_algo;
-       const struct git_hash_algo *compat = repo->compat_hash_algo;
-       struct object_id compat_oid;
-       int hdrlen, status = 0;
-       int compat_type = -1;
-
-       if (compat) {
-               compat_type = type_from_string_gently(type, -1, 1);
-               if (compat_type == OBJ_BLOB)
-                       hash_object_file(compat, buf, len, compat_type,
-                                        &compat_oid);
-               else if (compat_type != -1) {
-                       struct strbuf converted = STRBUF_INIT;
-                       convert_object_file(the_repository,
-                                           &converted, algo, compat,
-                                           buf, len, compat_type, 0);
-                       hash_object_file(compat, converted.buf, converted.len,
-                                        compat_type, &compat_oid);
-                       strbuf_release(&converted);
-               }
-       }
-
-       /* type string, SP, %lu of the length plus NUL must fit this */
-       hdrlen = strlen(type) + MAX_HEADER_LEN;
-       header = xmalloc(hdrlen);
-       write_object_file_prepare_literally(the_hash_algo, buf, len, type,
-                                           oid, header, &hdrlen);
-
-       if (!(flags & WRITE_OBJECT_FILE_PERSIST))
-               goto cleanup;
-       if (freshen_packed_object(oid) || freshen_loose_object(oid))
-               goto cleanup;
-       status = write_loose_object(oid, header, hdrlen, buf, len, 0, 0);
-       if (compat_type != -1)
-               return repo_add_loose_object_map(repo, oid, &compat_oid);
-
-cleanup:
-       free(header);
-       return status;
-}
-
 int force_object_loose(const struct object_id *oid, time_t mtime)
 {
        struct repository *repo = the_repository;

diff --git a/object-file.h b/object-file.h
index a979fd5e4da6ea3dd822c798ae8f5f88d4ed580d..6f4114245239323674bb27d9ecda1c531707970b 100644 (file)
--- a/object-file.h
+++ b/object-file.h
@@ -159,7 +159,7 @@ int parse_loose_header(const char *hdr, struct object_info *oi);
 
 enum {
        /*
-        * By default, `write_object_file_literally()` does not actually write
+        * By default, `write_object_file()` does not actually write
         * anything into the object store, but only computes the object ID.
         * This flag changes that so that the object will be written as a loose
         * object and persisted.
@@ -187,9 +187,6 @@ struct input_stream {
        int is_finished;
 };
 
-int write_object_file_literally(const void *buf, unsigned long len,
-                               const char *type, struct object_id *oid,
-                               unsigned flags);
 int stream_loose_object(struct input_stream *in_stream, size_t len,
                        struct object_id *oid);