diff options
| author |  Stefan Beller <sbeller@google.com> | 2018-04-25 11:20:59 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-04-26 10:54:27 +0900 |
| commit | 0df8e96566ddcae4adc4efc096944c064f60b8bd (patch) | |
| tree | 19c8b0277b21dcd9a9baa71ca5541bd59853afae /sequencer.c | |
| parent | cache.h: add repository argument to oid_object_info_extended (diff) | |
| download | tgif-0df8e96566ddcae4adc4efc096944c064f60b8bd.tar.xz | |
cache.h: add repository argument to oid_object_info
Add a repository argument to allow the callers of oid_object_info
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>
Reviewed-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index 667f35ebdf..44f0518b9c 100644 --- a/sequencer.c +++ b/sequencer.c @@ -2876,7 +2876,8 @@ int sequencer_pick_revisions(struct replay_opts *opts) if (!get_oid(name, &oid)) { if (!lookup_commit_reference_gently(&oid, 1)) { - enum object_type type = oid_object_info(&oid, + enum object_type type = oid_object_info(the_repository, + &oid, NULL); return error(_("%s: can't cherry-pick a %s"), name, type_name(type)); |