diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-21 22:38:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-21 22:38:43 -0800 |
| commit | 155d12912fec6c60ead6d6c1febda5fa6e6eb128 (patch) | |
| tree | cfa9a9521b6d1510cf76ff0fe1b708b30e81412f /git-repack.sh | |
| parent | ee072260dbff6914c24d956bcc2d46882831f1a0 (diff) | |
| parent | e4c9327a77bd59e85d4b17a612e78977d68773ee (diff) | |
| download | git-155d12912fec6c60ead6d6c1febda5fa6e6eb128.tar.xz | |
Merge branch 'jc/pack-reuse'
* jc/pack-reuse:
pack-objects: avoid delta chains that are too long.
git-repack: allow passing a couple of flags to pack-objects.
pack-objects: finishing touches.
pack-objects: reuse data from existing packs.
Diffstat (limited to 'git-repack.sh')
| -rwxr-xr-x | git-repack.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/git-repack.sh b/git-repack.sh index 1fafb6ecf6..3d6fec1c9a 100755 --- a/git-repack.sh +++ b/git-repack.sh @@ -3,17 +3,20 @@ # Copyright (c) 2005 Linus Torvalds # -USAGE='[-a] [-d] [-l] [-n]' +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 ;; + -q) quiet=-q ;; + -f) no_reuse_delta=--no-reuse-delta ;; + -l) local=--local ;; *) usage ;; esac shift @@ -39,9 +42,7 @@ case ",$all_into_one," in find . -type f \( -name '*.pack' -o -name '*.idx' \) -print` ;; esac -if [ "$local" ]; then - pack_objects="$pack_objects --local" -fi +pack_objects="$pack_objects $local $quiet $no_reuse_delta" name=$(git-rev-list --objects $rev_list $(git-rev-parse $rev_parse) 2>&1 | git-pack-objects --non-empty $pack_objects .tmp-pack) || exit 1 |