[PATCH] Fix git-rev-parse --default and --flags handling

diff --git a/git-prune-script b/git-prune-script
index 97646685b70ac18210be130566b2c36395120385..2e130c7f9698729f471edbdfdf9a3cce63c56ddd 100755 (executable)
--- a/git-prune-script
+++ b/git-prune-script
@@ -3,10 +3,11 @@
 . git-sh-setup-script || die "Not a git archive"
 
 dryrun=
+echo=
 while case "$#" in 0) break ;; esac
 do
     case "$1" in
-    -n) dryrun=echo ;;
+    -n) dryrun=-n echo=echo ;;
     --) break ;;
     -*) echo >&2 "usage: git-prune-script [ -n ] [ heads... ]"; exit 1 ;;
     *)  break ;;
@@ -14,12 +15,13 @@ do
     shift;
 done
 
-git-fsck-cache --cache --unreachable "$@" |
+git-fsck-cache --full --cache --unreachable "$@" |
 sed -ne '/unreachable /{
     s/unreachable [^ ][^ ]* //
     s|\(..\)|\1/|p
 }' | {
        cd "$GIT_OBJECT_DIRECTORY" || exit
-       xargs -r $dryrun rm -f
+       xargs $echo rm -f
 }
 
+git-prune-packed $dryrun