diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-11-10 05:48:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-12 05:50:05 (GMT) |
| commit | 878d832938100a0c4efc8373b782e086d2aae3cb (patch) | |
| tree | 7abc66fe2ccb5e6634eba5e6649d5877d3001c9e /notes-merge.c | |
| parent | 5684200fe3572cf70b7260d1f835d801ff6dd14e (diff) | |
| download | git-878d832938100a0c4efc8373b782e086d2aae3cb.zip git-878d832938100a0c4efc8373b782e086d2aae3cb.tar.gz git-878d832938100a0c4efc8373b782e086d2aae3cb.tar.bz2 | |
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>
Diffstat (limited to 'notes-merge.c')
| -rw-r--r-- | notes-merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/notes-merge.c b/notes-merge.c index 0c22f09..72688d3 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -558,7 +558,7 @@ int notes_merge(struct notes_merge_options *o, else if (!check_refname_format(o->local_ref, 0) && is_null_oid(&local_oid)) local = NULL; /* local_oid == null_oid indicates unborn ref */ - else if (!(local = lookup_commit_reference(the_repository, &local_oid))) + else if (!(local = lookup_commit_reference(o->repo, &local_oid))) die("Could not parse local commit %s (%s)", oid_to_hex(&local_oid), o->local_ref); trace_printf("\tlocal commit: %.7s\n", oid_to_hex(&local_oid)); @@ -576,7 +576,7 @@ int notes_merge(struct notes_merge_options *o, die("Failed to resolve remote notes ref '%s'", o->remote_ref); } - } else if (!(remote = lookup_commit_reference(the_repository, &remote_oid))) { + } else if (!(remote = lookup_commit_reference(o->repo, &remote_oid))) { die("Could not parse remote commit %s (%s)", oid_to_hex(&remote_oid), o->remote_ref); } |