Skip to content

Commit 878d832

Browse files
pcloudsgitster
authored andcommitted
notes-merge.c: remove implicit dependency the_repository
Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5684200 commit 878d832

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

notes-merge.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ int notes_merge(struct notes_merge_options *o,
558558
else if (!check_refname_format(o->local_ref, 0) &&
559559
is_null_oid(&local_oid))
560560
local = NULL; /* local_oid == null_oid indicates unborn ref */
561-
else if (!(local = lookup_commit_reference(the_repository, &local_oid)))
561+
else if (!(local = lookup_commit_reference(o->repo, &local_oid)))
562562
die("Could not parse local commit %s (%s)",
563563
oid_to_hex(&local_oid), o->local_ref);
564564
trace_printf("\tlocal commit: %.7s\n", oid_to_hex(&local_oid));
@@ -576,7 +576,7 @@ int notes_merge(struct notes_merge_options *o,
576576
die("Failed to resolve remote notes ref '%s'",
577577
o->remote_ref);
578578
}
579-
} else if (!(remote = lookup_commit_reference(the_repository, &remote_oid))) {
579+
} else if (!(remote = lookup_commit_reference(o->repo, &remote_oid))) {
580580
die("Could not parse remote commit %s (%s)",
581581
oid_to_hex(&remote_oid), o->remote_ref);
582582
}

0 commit comments

Comments
 (0)