get_sha1() shorthands for blob/tree objects

diff --git a/git-repack.sh b/git-repack.sh
index 430ddc5a706945035149464d0bea8f25acc21d3c..a5d349fd099a8d2a411d1b71ef8a6ff5d368ba32 100755 (executable)
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -3,17 +3,21 @@
 # Copyright (c) 2005 Linus Torvalds
 #
 
+USAGE='[-a] [-d] [-f] [-l] [-n] [-q]'
 . git-sh-setup
        
-no_update_info= all_into_one= remove_redundant= local=
+no_update_info= all_into_one= remove_redundant=
+local= quiet= no_reuse_delta=
 while case "$#" in 0) break ;; esac
 do
        case "$1" in
        -n)     no_update_info=t ;;
        -a)     all_into_one=t ;;
        -d)     remove_redundant=t ;;
-       -l)     local=t ;;
-       *)      break ;;
+       -q)     quiet=-q ;;
+       -f)     no_reuse_delta=--no-reuse-delta ;;
+       -l)     local=--local ;;
+       *)      usage ;;
        esac
        shift
 done
@@ -25,12 +29,10 @@ PACKDIR="$GIT_OBJECT_DIRECTORY/pack"
 case ",$all_into_one," in
 ,,)
        rev_list='--unpacked'
-       rev_parse='--all'
        pack_objects='--incremental'
        ;;
 ,t,)
        rev_list=
-       rev_parse='--all'
        pack_objects=
 
        # Redundancy check in all-into-one case is trivial.
@@ -38,10 +40,8 @@ case ",$all_into_one," in
            find . -type f \( -name '*.pack' -o -name '*.idx' \) -print`
        ;;
 esac
-if [ "$local" ]; then
-       pack_objects="$pack_objects --local"
-fi
-name=$(git-rev-list --objects $rev_list $(git-rev-parse $rev_parse) 2>&1 |
+pack_objects="$pack_objects $local $quiet $no_reuse_delta"
+name=$(git-rev-list --objects --all $rev_list 2>&1 |
        git-pack-objects --non-empty $pack_objects .tmp-pack) ||
        exit 1
 if [ -z "$name" ]; then
@@ -73,6 +73,7 @@ then
                  done
                )
        fi
+       git-prune-packed
 fi
 
 case "$no_update_info" in