From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 6 Jun 2013 19:17:52 +0000 (-0700)
Subject: Merge branch 'nd/prune-packed-dryrun-verbose'
X-Git-Tag: v1.8.4-rc0~206
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9d54f97e34a92d1504f24a5896e9741111f38d79?hp=-c

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

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

9d54f97e34a92d1504f24a5896e9741111f38d79
diff --combined builtin/prune.c
index b90e5cc361,59d1fdcecf..6366917c6d
--- a/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);