[PATCH 2/4] merge-ort: stop passing "opt" to read_oid_strbuf()
- From
Jeff King <peff@peff.net>
- Date
- Sep 14, 2023, 09:39 UTC
- Message-ID
- <20230914093953.GB2254894@coredump.intra.peff.net>
- In-Reply-To
- <20230914093409.GA2254811@coredump.intra.peff.net>
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> --- merge-ort.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/merge-ort.c b/merge-ort.c index 027ecc7f78..31c663b297 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -3491,8 +3491,7 @@ static int sort_dirs_next_to_their_children(const char *one, const char *two) return c1 - c2; } -static int read_oid_strbuf(struct merge_options *opt, - const struct object_id *oid, +static int read_oid_strbuf(const struct object_id *oid, struct strbuf *dst) { void *buf; @@ -3527,8 +3526,8 @@ static int blob_unchanged(struct merge_options *opt, if (oideq(&base->oid, &side->oid)) return 1; - if (read_oid_strbuf(opt, &base->oid, &basebuf) || - read_oid_strbuf(opt, &side->oid, &sidebuf)) + if (read_oid_strbuf(&base->oid, &basebuf) || + read_oid_strbuf(&side->oid, &sidebuf)) goto error_return; /* * Note: binary | is used so that both renormalizations are
-- 2.42.0.628.g8a27295885