builtin/fmt-merge-msg: convert remaining code to object_id
We were using the util pointer, which is a pointer to void, as an unsigned char pointer. The pointer actually points to a struct origin_data, which has a struct object_id as its first member, which in turn has an unsigned char array as its first member, so this was valid. Since we want to convert this to struct object_id, simply change the pointer we're using. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
brian m. carlson committed
Mar 12, 2018 at 02:27 UTC
f8ddeff50930d7c330b6f68745631c34e63540bd
1 file changed
+2
-2
builtin/fmt-merge-msg.c
+2
-2
@@ -485,10 +485,10 @@ static void fmt_merge_msg_sigs(struct strbuf *out)
485
struct strbuf tagbuf = STRBUF_INIT;
486
487
for (i = 0; i < origins.nr; i++) {
488
- unsigned char *sha1 = origins.items[i].util;
488
+ struct object_id *oid = origins.items[i].util;
489
enum object_type type;
490
unsigned long size, len;
491
- char *buf = read_sha1_file(sha1, &type, &size);
491
+ char *buf = read_sha1_file(oid->hash, &type, &size);
492
struct strbuf sig = STRBUF_INIT;
493
494
if (!buf || type != OBJ_TAG)