Merge branch 'ks/difftool-dir-diff-copy-fix'

diff --git a/builtin/prune.c b/builtin/prune.c
index b90e5cc361eb41064eaee242d8b13ceabe4335bc..6366917c6de55e171a7f697b22f1de10293addf5 100644 (file)
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -165,7 +165,7 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
        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);