Merge with gitk.

diff --git a/git-prune-script b/git-prune-script
index 9ba89a5b9d0d484aee54d0bdb6deabdc71962c85..a8e338c488865b1579071ea363fc18fa8e3d8890 100755 (executable)
--- a/git-prune-script
+++ b/git-prune-script
@@ -1,4 +1,7 @@
 #!/bin/sh
+
+. git-sh-setup-script || die "Not a git archive"
+
 dryrun=
 while case "$#" in 0) break ;; esac
 do
@@ -11,26 +14,12 @@ 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 $dryrun rm -f
 }
+