diff options
| author | Jeff King <peff@peff.net> | 2023-09-14 12:39:53 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-09-14 22:01:29 +0300 |
| commit | 1c9419ae9d262dab33bef22dea5c166d990b921e (patch) | |
| tree | e93263669c1fc368bfaba62386afd147d671efb9 /merge-ort.c | |
| parent | 808e83f2667e4b442a8f58f0c7ef55feb6864f65 (diff) | |
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>
Diffstat (limited to 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 7 |
1 files 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 |