development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-04 16:17:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

object-file: add a compat_oid_in parameter to write_object_file_flags

Browse source 
To create the proper signatures for commit objects both versions of
the commit object need to be generated and signed.  After that it is
a waste to throw away the work of generating the compatibility hash
so update write_object_file_flags to take a compatibility hash input
parameter that it can use to skip the work of generating the
compatability hash.

Update the places that don't generate the compatability hash to
pass NULL so it is easy to tell write_object_file_flags should
not attempt to use their compatability hash.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Eric W. Biederman 2023-10-01 21:40:12 -05:00 committed by Junio C Hamano
parent 63a6745a07
commit c2538492df
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cache-tree.c
View file

@ -448,7 +448,7 @@ static int update_one(struct cache_tree *it,
hash_object_file(the_hash_algo, buffer.buf, buffer.len, hash_object_file(the_hash_algo, buffer.buf, buffer.len,
OBJ_TREE, &it->oid); OBJ_TREE, &it->oid);
} else if (write_object_file_flags(buffer.buf, buffer.len, OBJ_TREE, } else if (write_object_file_flags(buffer.buf, buffer.len, OBJ_TREE,
&it->oid, flags & WRITE_TREE_SILENT &it->oid, NULL, flags & WRITE_TREE_SILENT
? HASH_SILENT : 0)) { ? HASH_SILENT : 0)) {
strbuf_release(&buffer); strbuf_release(&buffer);
return -1; return -1;

6
object-file.c
View file

@ -2235,7 +2235,7 @@ int stream_loose_object(struct input_stream *in_stream, size_t len,
int write_object_file_flags(const void *buf, unsigned long len, int write_object_file_flags(const void *buf, unsigned long len,
enum object_type type, struct object_id *oid, enum object_type type, struct object_id *oid,
unsigned flags) struct object_id *compat_oid_in, unsigned flags)
{ {
struct repository *repo = the_repository; struct repository *repo = the_repository;
const struct git_hash_algo *algo = repo->hash_algo; const struct git_hash_algo *algo = repo->hash_algo;
@ -2246,7 +2246,9 @@ int write_object_file_flags(const void *buf, unsigned long len,
/* Generate compat_oid */ /* Generate compat_oid */
if (compat) { if (compat) {
if (type == OBJ_BLOB) if (compat_oid_in)
oidcpy(&compat_oid, compat_oid_in);
else if (type == OBJ_BLOB)
hash_object_file(compat, buf, len, type, &compat_oid); hash_object_file(compat, buf, len, type, &compat_oid);
else { else {
struct strbuf converted = STRBUF_INIT; struct strbuf converted = STRBUF_INIT;

4
object-store-ll.h
View file

@ -255,11 +255,11 @@ void hash_object_file(const struct git_hash_algo *algo, const void *buf,
int write_object_file_flags(const void *buf, unsigned long len, int write_object_file_flags(const void *buf, unsigned long len,
enum object_type type, struct object_id *oid, enum object_type type, struct object_id *oid,
unsigned flags); struct object_id *comapt_oid_in, unsigned flags);
static inline int write_object_file(const void *buf, unsigned long len, static inline int write_object_file(const void *buf, unsigned long len,
enum object_type type, struct object_id *oid) enum object_type type, struct object_id *oid)
{ {
return write_object_file_flags(buf, len, type, oid, 0); return write_object_file_flags(buf, len, type, oid, NULL, 0);
} }
int write_object_file_literally(const void *buf, unsigned long len, int write_object_file_literally(const void *buf, unsigned long len,