send_ref(): convert local variable "peeled" to object_id
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael Haggerty committed
May 25, 2015 at 18:39 UTC
21758affae79a23e402c46cb375a0fd0407050c9
1 file changed
+3
-3
upload-pack.c
+3
-3
@@ -717,7 +717,7 @@ static int send_ref(const char *refname, const struct object_id *oid,
717
" side-band-64k ofs-delta shallow no-progress"
718
" include-tag multi_ack_detailed";
719
const char *refname_nons = strip_namespace(refname);
720
- unsigned char peeled[20];
720
+ struct object_id peeled;
721
722
if (mark_our_ref(refname, oid))
723
return 0;
@@ -738,8 +738,8 @@ static int send_ref(const char *refname, const struct object_id *oid,
738
packet_write(1, "%s %s\n", oid_to_hex(oid), refname_nons);
739
}
740
capabilities = NULL;
741
- if (!peel_ref(refname, peeled))
742
- packet_write(1, "%s %s^{}\n", sha1_to_hex(peeled), refname_nons);
741
+ if (!peel_ref(refname, peeled.hash))
742
+ packet_write(1, "%s %s^{}\n", oid_to_hex(&peeled), refname_nons);
743
return 0;
744
}
745