Merge branch 'nd/prune-packed-dryrun-verbose'

* nd/prune-packed-dryrun-verbose:
prune-packed: avoid implying "1" is DRY_RUN in prune_packed_objects()

diff --combined builtin/prune.c
index b90e5cc361eb41064eaee242d8b13ceabe4335bc,59d1fdcecf2a3524eba97477127a32e9c415915a..6366917c6de55e171a7f697b22f1de10293addf5
--- 1/builtin/prune.c
--- 2/builtin/prune.c
+++ b/builtin/prune.c
@@@ -132,8 -132,8 +132,8 @@@ int cmd_prune(int argc, const char **ar
                OPT__DRY_RUN(&show_only, N_("do not remove, show only")),
                OPT__VERBOSE(&verbose, N_("report pruned objects")),
                OPT_BOOL(0, "progress", &show_progress, N_("show progress")),
 -              OPT_DATE(0, "expire", &expire,
 -                       N_("expire objects older than <time>")),
 +              OPT_EXPIRY_DATE(0, "expire", &expire,
 +                              N_("expire objects older than <time>")),
                OPT_END()
        };
        char *s;
@@@ -165,7 -165,7 +165,7 @@@
        stop_progress(&progress);
        prune_object_dir(get_object_directory());
  
-       prune_packed_objects(show_only);
+       prune_packed_objects(show_only ? PRUNE_PACKED_DRY_RUN : 0);
        remove_temporary_files(get_object_directory());
        s = mkpathdup("%s/pack", get_object_directory());
        remove_temporary_files(s);