notes-merge.c: remove implicit dependency the_repository
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Nov 10, 2018 at 06:48 UTC
878d832938100a0c4efc8373b782e086d2aae3cb
1 file changed
+2
-2
notes-merge.c
+2
-2
@@ -558,7 +558,7 @@ int notes_merge(struct notes_merge_options *o,
558
else if (!check_refname_format(o->local_ref, 0) &&
559
is_null_oid(&local_oid))
560
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)))
562
die("Could not parse local commit %s (%s)",
563
oid_to_hex(&local_oid), o->local_ref);
564
trace_printf("\tlocal commit: %.7s\n", oid_to_hex(&local_oid));
@@ -576,7 +576,7 @@ int notes_merge(struct notes_merge_options *o,
576
die("Failed to resolve remote notes ref '%s'",
577
o->remote_ref);
578
}
579
- } else if (!(remote = lookup_commit_reference(the_repository, &remote_oid))) {
579
+ } else if (!(remote = lookup_commit_reference(o->repo, &remote_oid))) {
580
die("Could not parse remote commit %s (%s)",
581
oid_to_hex(&remote_oid), o->remote_ref);
582
}