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

diff --git a/git-prune-script b/git-prune-script
index d0f19f19e2e5ea917bd2a8bf6214aa52fdc83bbc..2e130c7f9698729f471edbdfdf9a3cce63c56ddd 100755 (executable)
--- a/git-prune-script
+++ b/git-prune-script
@@ -1,2 +1,27 @@
 #!/bin/sh
-fsck-cache --unreachable $(cat .git/HEAD ) | grep unreachable | cut -d' ' -f3 | sed 's:^\(..\):.git/objects/\1/:' | xargs rm
+
+. git-sh-setup-script || die "Not a git archive"
+
+dryrun=
+echo=
+while case "$#" in 0) break ;; esac
+do
+    case "$1" in
+    -n) dryrun=-n echo=echo ;;
+    --) break ;;
+    -*) echo >&2 "usage: git-prune-script [ -n ] [ heads... ]"; exit 1 ;;
+    *)  break ;;
+    esac
+    shift;
+done
+
+git-fsck-cache --full --cache --unreachable "$@" |
+sed -ne '/unreachable /{
+    s/unreachable [^ ][^ ]* //
+    s|\(..\)|\1/|p
+}' | {
+       cd "$GIT_OBJECT_DIRECTORY" || exit
+       xargs $echo rm -f
+}
+
+git-prune-packed $dryrun