diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-02-05 00:48:31 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2022-02-25 17:16:32 -0800 |
| commit | 0ff7b4f976b78ab38313356b3e0582e5fa9a3bcc (patch) | |
| tree | e1540b722fef4fed68ded9fc975c4e5b84b4f2fb | |
| parent | object-file API: split up and simplify check_object_signature() (diff) | |
| download | tgif-0ff7b4f976b78ab38313356b3e0582e5fa9a3bcc.tar.xz | |
object API: rename hash_object_file_literally() to write_*()
Before 0c3db67cc81 (hash-object --literally: fix buffer overrun with
extra-long object type, 2015-05-04) the hash-object code being changed
here called write_sha1_file() to both hash and write a loose
object. Before that we'd use hash_sha1_file() to if "-w" wasn't
provided, and otherwise call write_sha1_file().
Now we'll always call the same function for both writing. Let's rename
it from hash_*_literally() to write_*_literally(). Even though the
write_*() might not actually write if HASH_WRITE_OBJECT isn't in
"flags", having it be more similar to write_object_file_flags() than
hash_object_file(), but carrying a name that would suggest that it's a
variant of the latter is confusing.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/hash-object.c | 2 | ||||
| -rw-r--r-- | object-file.c | 6 | ||||
| -rw-r--r-- | object-store.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/builtin/hash-object.c b/builtin/hash-object.c index c7b3ad74c6..f4cbd9c4ae 100644 --- a/builtin/hash-object.c +++ b/builtin/hash-object.c @@ -25,7 +25,7 @@ static int hash_literally(struct object_id *oid, int fd, const char *type, unsig if (strbuf_read(&buf, fd, 4096) < 0) ret = -1; else - ret = hash_object_file_literally(buf.buf, buf.len, type, oid, + ret = write_object_file_literally(buf.buf, buf.len, type, oid, flags); strbuf_release(&buf); return ret; diff --git a/object-file.c b/object-file.c index f985492274..9e5b849693 100644 --- a/object-file.c +++ b/object-file.c @@ -2027,9 +2027,9 @@ int write_object_file_flags(const void *buf, unsigned long len, return write_loose_object(oid, hdr, hdrlen, buf, len, 0, flags); } -int hash_object_file_literally(const void *buf, unsigned long len, - const char *type, struct object_id *oid, - unsigned flags) +int write_object_file_literally(const void *buf, unsigned long len, + const char *type, struct object_id *oid, + unsigned flags) { char *header; int hdrlen, status = 0; diff --git a/object-store.h b/object-store.h index eab1e2a967..29169d117f 100644 --- a/object-store.h +++ b/object-store.h @@ -258,9 +258,9 @@ static inline int write_object_file(const void *buf, unsigned long len, return write_object_file_flags(buf, len, type, oid, 0); } -int hash_object_file_literally(const void *buf, unsigned long len, - const char *type, struct object_id *oid, - unsigned flags); +int write_object_file_literally(const void *buf, unsigned long len, + const char *type, struct object_id *oid, + unsigned flags); /* * Add an object file to the in-memory object store, without writing it |