kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

send-pack: convert remaining functions to struct object_id 

Convert the remaining function, feed_object, to use struct object_id.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
brian m. carlson 2018-03-12 02:27:32 +00:00 committed by Junio C Hamano
parent 16f0705df1
commit 246d7400fb
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
send-pack.c
View File

@ -37,14 +37,14 @@ int option_parse_push_signed(const struct option *opt,
die("bad %s argument: %s", opt->long_name, arg); die("bad %s argument: %s", opt->long_name, arg);
} }


static void feed_object(const unsigned char *sha1, FILE *fh, int negative) static void feed_object(const struct object_id *oid, FILE *fh, int negative)
{ {
if (negative && !has_sha1_file(sha1)) if (negative && !has_sha1_file(oid->hash))
return; return;


if (negative) if (negative)
putc('^', fh); putc('^', fh);
fputs(sha1_to_hex(sha1), fh); fputs(oid_to_hex(oid), fh);
putc('\n', fh); putc('\n', fh);
} }


@ -89,13 +89,13 @@ static int pack_objects(int fd, struct ref *refs, struct oid_array *extra, struc
*/ */
po_in = xfdopen(po.in, "w"); po_in = xfdopen(po.in, "w");
for (i = 0; i < extra->nr; i++) for (i = 0; i < extra->nr; i++)
feed_object(extra->oid[i].hash, po_in, 1); feed_object(&extra->oid[i], po_in, 1);


while (refs) { while (refs) {
if (!is_null_oid(&refs->old_oid)) if (!is_null_oid(&refs->old_oid))
feed_object(refs->old_oid.hash, po_in, 1); feed_object(&refs->old_oid, po_in, 1);
if (!is_null_oid(&refs->new_oid)) if (!is_null_oid(&refs->new_oid))
feed_object(refs->new_oid.hash, po_in, 0); feed_object(&refs->new_oid, po_in, 0);
refs = refs->next; refs = refs->next;
} }