mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-05 15:16:34 +02:00
Code

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>
This commit is contained in:
Jeff King 2023-09-14 05:39:53 -04:00 committed by Junio C Hamano
parent 808e83f266
commit 1c9419ae9d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
merge-ort.c
View File

@ -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