X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-repack.sh;h=e0c9f323c3ba8a4f42ec5a4a4fa53a8bddb36b34;hb=e686eb9870d6b382f0760e3e859e93c8c2dfb31b;hp=3d6fec1c9a480887f68d2bde3c184ca1d85d1933;hpb=f0b0af1b04f558b684cae2a3b805ca4bab84d45f;p=git.git diff --git a/git-repack.sh b/git-repack.sh index 3d6fec1c..e0c9f323 100755 --- a/git-repack.sh +++ b/git-repack.sh @@ -5,9 +5,9 @@ USAGE='[-a] [-d] [-f] [-l] [-n] [-q]' . git-sh-setup - + no_update_info= all_into_one= remove_redundant= -local= quiet= no_reuse_delta= +local= quiet= no_reuse_delta= extra= while case "$#" in 0) break ;; esac do case "$1" in @@ -17,6 +17,8 @@ do -q) quiet=-q ;; -f) no_reuse_delta=--no-reuse-delta ;; -l) local=--local ;; + --window=*) extra="$extra $1" ;; + --depth=*) extra="$extra $1" ;; *) usage ;; esac shift @@ -29,12 +31,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. @@ -42,8 +42,8 @@ case ",$all_into_one," in find . -type f \( -name '*.pack' -o -name '*.idx' \) -print` ;; esac -pack_objects="$pack_objects $local $quiet $no_reuse_delta" -name=$(git-rev-list --objects $rev_list $(git-rev-parse $rev_parse) 2>&1 | +pack_objects="$pack_objects $local $quiet $no_reuse_delta$extra" +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 @@ -75,6 +75,7 @@ then done ) fi + git-prune-packed fi case "$no_update_info" in