On Wed, Dec 21, 2022 at 05:04:44AM +0100, Christian Couder wrote:
> From: Christian Couder <chriscool@xxxxxxxxxxxxx>
>
> 9535ce7337 (pack-objects: add list-objects filtering, 2017-11-21)
> taught pack-objects to use --filter, but required the use of
> --stdout since a partial clone mechanism was not yet in place to
> handle missing objects. Since then, changes like 9e27beaa23
> (promisor-remote: implement promisor_remote_get_direct(), 2019-06-25)
> and others added support to dynamically fetch objects that were missing.
>
> Remove the --stdout requirement so that in a follow-up commit, repack
> can pass --filter to pack-objects to omit certain objects from the
> resulting packfile.
>
> Signed-off-by: John Cai <johncai86@xxxxxxxxx>
> Signed-off-by: Christian Couder <chriscool@xxxxxxxxxxxxx>
> ---
> builtin/pack-objects.c | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
> index 2193f80b89..aa0b13d015 100644
> --- a/builtin/pack-objects.c
> +++ b/builtin/pack-objects.c
> @@ -4371,12 +4371,8 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
> if (!rev_list_all || !rev_list_reflog || !rev_list_index)
> unpack_unreachable_expiration = 0;
>
> - if (filter_options.choice) {
> - if (!pack_to_stdout)
> - die(_("cannot use --filter without --stdout"));
> - if (stdin_packs)
> - die(_("cannot use --filter with --stdin-packs"));
> - }
> + if (stdin_packs && filter_options.choice)
> + die(_("cannot use --filter with --stdin-packs"));
>
> if (stdin_packs && use_internal_rev_list)
> die(_("cannot use internal rev list with --stdin-packs"));
Can we add a test to exercise this now-allowed combination of options?
Patrick
Attachment:
signature.asc
Description: PGP signature
