diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-12-04 10:31:46 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-12-04 10:31:46 +0900 |
| commit | 33833ed08b67d1c43f4121ce8b1ec7e03b734dea (patch) | |
| tree | fcb768700151c4718f980a3dfef2b0ecc2e473b2 /builtin/rev-list.c | |
| parent | 4083a6f05206077a50af7658bedc17a94c54607d (diff) | |
| parent | 281164995159ed641f5e76f40515baf0b5811943 (diff) | |
| download | git-33833ed08b67d1c43f4121ce8b1ec7e03b734dea.tar.gz | |
Merge branch 'kn/the-repository' into kn/midx-wo-the-repository
* kn/the-repository:
packfile.c: remove unnecessary prepare_packed_git() call
midx: add repository to `multi_pack_index` struct
config: make `packed_git_(limit|window_size)` non-global variables
config: make `delta_base_cache_limit` a non-global variable
packfile: pass down repository to `for_each_packed_object`
packfile: pass down repository to `has_object[_kept]_pack`
packfile: pass down repository to `odb_pack_name`
packfile: pass `repository` to static function in the file
packfile: use `repository` from `packed_git` directly
packfile: add repository to struct `packed_git`
Diffstat (limited to 'builtin/rev-list.c')
| -rw-r--r-- | builtin/rev-list.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rev-list.c b/builtin/rev-list.c index 3078787115..8fe83893fa 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -121,7 +121,7 @@ static inline void finish_object__ma(struct object *obj) return; case MA_ALLOW_PROMISOR: - if (is_promisor_object(&obj->oid)) + if (is_promisor_object(the_repository, &obj->oid)) return; die("unexpected missing %s object '%s'", type_name(obj->type), oid_to_hex(&obj->oid)); |