Call prune-packed from "git prune" as well.

diff --git a/git-prune-script b/git-prune-script
old mode 100644 (file)
new mode 100755 (executable)
index 9ba89a5..2e130c7
--- a/git-prune-script
+++ b/git-prune-script
@@ -1,9 +1,13 @@
 #!/bin/sh
+
+. 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 ;;
@@ -11,26 +15,13 @@ do
     shift;
 done
 
-# Defaulting to include .git/refs/*/* may be debatable from the
-# purist POV but power users can always give explicit parameters
-# to the script anyway.
-
-case "$#" in
-0)
-    x_40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
-    x_40="$x_40$x_40$x_40$x_40$x_40$x_40$x_40$x_40"
-    set x $(sed -ne "/^$x_40\$/p" .git/HEAD .git/refs/*/* 2>/dev/null)
-    shift ;;
-esac
-
-git-fsck-cache --cache --unreachable "$@" |
+git-fsck-cache --full --cache --unreachable "$@" |
 sed -ne '/unreachable /{
     s/unreachable [^ ][^ ]* //
     s|\(..\)|\1/|p
 }' | {
-       case "$SHA1_FILE_DIRECTORY" in
-       '') cd .git/objects/ ;;
-       *) cd "$SHA1_FILE_DIRECTORY" ;;
-       esac || exit
-       xargs -r $dryrun rm -f
+       cd "$GIT_OBJECT_DIRECTORY" || exit
+       xargs $echo rm -f
 }
+
+git-prune-packed $dryrun