diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-09-23 07:32:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-09-23 07:32:57 -0700 |
| commit | 19b316ff3cc1ef6a8ffe59b60f057c450b2701b3 (patch) | |
| tree | 1b808625272f84571c18037b8a22051950b88314 /builtin/pack-objects.c | |
| parent | Merge branch 'jk/setup-revisions-freefix' into next (diff) | |
| download | git-19b316ff3cc1ef6a8ffe59b60f057c450b2701b3.tar.gz git-19b316ff3cc1ef6a8ffe59b60f057c450b2701b3.zip | |
Revert "Merge branch 'jk/setup-revisions-freefix' into next"
This reverts commit b178f27e6ddfa8d515dcd445b6bf17119f962c44, reversing
changes made to 2d0aec78212bcdf7c7c067a74b471a9e0ce60adf.
Diffstat (limited to 'builtin/pack-objects.c')
| -rw-r--r-- | builtin/pack-objects.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 5856b5f6bf..1494afcf3d 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -4650,7 +4650,7 @@ static void get_object_list_path_walk(struct rev_info *revs) die(_("failed to pack objects via path-walk")); } -static void get_object_list(struct rev_info *revs, struct strvec *argv) +static void get_object_list(struct rev_info *revs, int ac, const char **av) { struct setup_revision_opt s_r_opt = { .allow_exclude_promisor_objects = 1, @@ -4660,7 +4660,7 @@ static void get_object_list(struct rev_info *revs, struct strvec *argv) int save_warning; save_commit_buffer = 0; - setup_revisions_from_strvec(argv, revs, &s_r_opt); + setup_revisions(ac, av, revs, &s_r_opt); /* make sure shallows are read */ is_repository_shallow(the_repository); @@ -5229,7 +5229,7 @@ int cmd_pack_objects(int argc, revs.include_check = is_not_in_promisor_pack; revs.include_check_obj = is_not_in_promisor_pack_obj; } - get_object_list(&revs, &rp); + get_object_list(&revs, rp.nr, rp.v); release_revisions(&revs); } cleanup_preferred_base(); |