Merge http://members.cox.net/junkio/git-jc.git/

diff --cc fsck-cache.c
Simple merge

diff --cc git-prune-script
index a24ba616dd4181dd5a5bd97a2d05228080894545,30a989e8f4d19bbcbc71bbf1d74015e56bf9728b..9ba89a5b9d0d484aee54d0bdb6deabdc71962c85
mode 100755,100755..100644
--- 1/git-prune-script
--- 2/git-prune-script
+++ b/git-prune-script
@@@ -1,4 -1,37 +1,36 @@@
  #!/bin/sh
- REFS=$(cat .git/refs/*/*)
- [ "$REFS" ] || exit 1
- git-fsck-cache --unreachable $REFS | grep unreachable | cut -d' ' -f3 | sed 's:^\(..\):.git/objects/\1/:' | xargs -r rm
 -
+ dryrun=
+ while case "$#" in 0) break ;; esac
+ do
+     case "$1" in
+     -n) dryrun=echo ;;
+     --) break ;;
+     -*) echo >&2 "usage: git-prune-script [ -n ] [ heads... ]"; exit 1 ;;
+     *)  break ;;
+     esac
+     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 "$@" |
+ 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
+ }