diff options
| author | Nicolas Pitre <nico@cam.org> | 2007-05-09 12:59:40 -0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-10 15:22:33 -0700 |
| commit | 479b56ba50144b30f28c5b225d412125c07def9f (patch) | |
| tree | 1e23d16ac492d4bbb560f32b3d759ad4de1a7fb0 | |
| parent | fa736f72b0840950e32dfd8bc470e91831107b10 (diff) | |
| download | git-479b56ba50144b30f28c5b225d412125c07def9f.tar.gz git-479b56ba50144b30f28c5b225d412125c07def9f.tar.xz | |
make "repack -f" imply "pack-objects --no-reuse-object"
Recomputing delta is much more expensive than recompressing
anyway, and when the user says 'repack -f', it is a sign that
the user is willing to spend CPU cycles.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rwxr-xr-x | git-repack.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-repack.sh b/git-repack.sh index ddfa8b44a..8bf66a4fe 100755 --- a/git-repack.sh +++ b/git-repack.sh @@ -8,7 +8,7 @@ SUBDIRECTORY_OK='Yes' . git-sh-setup no_update_info= all_into_one= remove_redundant= -local= quiet= no_reuse_delta= extra= +local= quiet= no_reuse= extra= while case "$#" in 0) break ;; esac do case "$1" in @@ -16,7 +16,7 @@ do -a) all_into_one=t ;; -d) remove_redundant=t ;; -q) quiet=-q ;; - -f) no_reuse_delta=--no-reuse-delta ;; + -f) no_reuse=--no-reuse-object ;; -l) local=--local ;; --window=*) extra="$extra $1" ;; --depth=*) extra="$extra $1" ;; @@ -61,7 +61,7 @@ case ",$all_into_one," in ;; esac -args="$args $local $quiet $no_reuse_delta$extra" +args="$args $local $quiet $no_reuse$extra" name=$(git-pack-objects --non-empty --all --reflog $args </dev/null "$PACKTMP") || exit 1 if [ -z "$name" ]; then |