X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-repack.sh;h=a5d349fd099a8d2a411d1b71ef8a6ff5d368ba32;hb=2eaf273d518717c84d748051e05210656f7b7e88;hp=3d6fec1c9a480887f68d2bde3c184ca1d85d1933;hpb=2e12a089ff1e011689f609aa1a687050a9de2ee4;p=git.git diff --git a/git-repack.sh b/git-repack.sh index 3d6fec1c..a5d349fd 100755 --- a/git-repack.sh +++ b/git-repack.sh @@ -29,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. @@ -43,7 +41,7 @@ case ",$all_into_one," in ;; esac pack_objects="$pack_objects $local $quiet $no_reuse_delta" -name=$(git-rev-list --objects $rev_list $(git-rev-parse $rev_parse) 2>&1 | +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 +73,7 @@ then done ) fi + git-prune-packed fi case "$no_update_info" in