summaryrefslogtreecommitdiff
path: root/builtin/prune.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-06 19:17:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-06 19:17:52 (GMT)
commit9d54f97e34a92d1504f24a5896e9741111f38d79 (patch)
tree6449a87822b4479e587091f76671e414a83fce28 /builtin/prune.c
parent99d9ec090677c925c534001f01cbaf303a31cb82 (diff)
parentaf0b4a3b5973ebdf8fcdedcccbc2e8ddb93c8534 (diff)
downloadgit-9d54f97e34a92d1504f24a5896e9741111f38d79.zip
git-9d54f97e34a92d1504f24a5896e9741111f38d79.tar.gz
git-9d54f97e34a92d1504f24a5896e9741111f38d79.tar.bz2
Merge branch 'nd/prune-packed-dryrun-verbose'
* nd/prune-packed-dryrun-verbose: prune-packed: avoid implying "1" is DRY_RUN in prune_packed_objects()
Diffstat (limited to 'builtin/prune.c')
-rw-r--r--builtin/prune.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/prune.c b/builtin/prune.c
index b90e5cc..6366917 100644
--- 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);