merge-ort: stop passing "opt" to read_oid_strbuf()
This function doesn't look at its merge_options parameter. It used to pass it down to err(), but that function no longer exists (and didn't look at "opt" anyway). We can drop it here. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Sep 14, 2023 at 05:39 UTC
1c9419ae9d262dab33bef22dea5c166d990b921e
1 file changed
+3
-4
merge-ort.c
+3
-4
@@ -3491,8 +3491,7 @@ static int sort_dirs_next_to_their_children(const char *one, const char *two)
3491
return c1 - c2;
3492
}
3493
3494
-static int read_oid_strbuf(struct merge_options *opt,
3495
- const struct object_id *oid,
3494
+static int read_oid_strbuf(const struct object_id *oid,
3495
struct strbuf *dst)
3496
{
3497
void *buf;
@@ -3527,8 +3526,8 @@ static int blob_unchanged(struct merge_options *opt,
3526
if (oideq(&base->oid, &side->oid))
3527
return 1;
3528
3530
- if (read_oid_strbuf(opt, &base->oid, &basebuf) ||
3531
- read_oid_strbuf(opt, &side->oid, &sidebuf))
3529
+ if (read_oid_strbuf(&base->oid, &basebuf) ||
3530
+ read_oid_strbuf(&side->oid, &sidebuf))
3531
goto error_return;
3532
/*
3533
* Note: binary | is used so that both renormalizations are