diff options
author | Stefan Beller <sbeller@google.com> | 2018-06-29 04:21:57 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-06-29 20:43:39 +0300 |
commit | 21e1ee8f4f4b7767d506b02504e97f6bcaef13a0 (patch) | |
tree | fe7a386acffd7f8c142858d06a70153cbe3ba2c9 /ref-filter.c | |
parent | f86bcc7b2ce6cad68ba1a48a528e380c6126705e (diff) |
commit: add repository argument to lookup_commit_reference_gently
Add a repository argument to allow callers of
lookup_commit_reference_gently to be more specific about which
repository to handle. This is a small mechanical change; it doesn't
change the implementation to handle repositories other than
the_repository yet.
As with the previous commits, use a macro to catch callers passing a
repository other than the_repository at compile time.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ref-filter.c')
-rw-r--r-- | ref-filter.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ref-filter.c b/ref-filter.c index ec9479af1f8..49021ee4467 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -2026,7 +2026,8 @@ static int ref_filter_handler(const char *refname, const struct object_id *oid, * non-commits early. The actual filtering is done later. */ if (filter->merge_commit || filter->with_commit || filter->no_commit || filter->verbose) { - commit = lookup_commit_reference_gently(oid, 1); + commit = lookup_commit_reference_gently(the_repository, oid, + 1); if (!commit) return 0; /* We perform the filtering for the '--contains' option... */ @@ -2383,7 +2384,8 @@ int parse_opt_merge_filter(const struct option *opt, const char *arg, int unset) if (get_oid(arg, &oid)) die(_("malformed object name %s"), arg); - rf->merge_commit = lookup_commit_reference_gently(&oid, 0); + rf->merge_commit = lookup_commit_reference_gently(the_repository, + &oid, 0); if (!rf->merge_commit) return opterror(opt, "must point to a commit", 0); |