X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-prune.sh;h=c5a5d29aaacf753b70e715169cbb7f74f0193e4a;hb=1a82e79315ed633f6b0b1fc4076054950c5380d3;hp=c4de7f5f250b647065c97dabbb234216f5c8c718;hpb=c3e24a7d461abaacc16c014ee427b37ab0102ca7;p=git.git diff --git a/git-prune.sh b/git-prune.sh index c4de7f5f..c5a5d29a 100755 --- a/git-prune.sh +++ b/git-prune.sh @@ -1,6 +1,7 @@ #!/bin/sh -. git-sh-setup || die "Not a git archive" +USAGE='[-n] [--] [...]' +. git-sh-setup dryrun= echo= @@ -9,14 +10,18 @@ do case "$1" in -n) dryrun=-n echo=echo ;; --) break ;; - -*) echo >&2 "usage: git-prune [ -n ] [ heads... ]"; exit 1 ;; + -*) usage ;; *) break ;; esac shift; done sync -git-fsck-objects --full --cache --unreachable "$@" | +case "$#" in +0) git-fsck-objects --full --cache --unreachable ;; +*) git-fsck-objects --full --cache --unreachable $(git-rev-parse --all) "$@" ;; +esac | + sed -ne '/unreachable /{ s/unreachable [^ ][^ ]* // s|\(..\)|\1/|p @@ -28,8 +33,7 @@ sed -ne '/unreachable /{ git-prune-packed $dryrun -redundant=$(git-pack-redundant --all) -if test "" != "$redundant" +if redundant=$(git-pack-redundant --all 2>/dev/null) && test "" != "$redundant" then if test "" = "$dryrun" then