summaryrefslogtreecommitdiff
path: root/git-repack.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-01 22:34:19 -0700
committerJunio C Hamano <gitster@pobox.com>2009-04-01 22:34:19 -0700
commit3c91bf6805249d0f59ddff4e5dc4118127527243 (patch)
tree8f07aa193c5206f736c1dbe2e3ac688938704636 /git-repack.sh
parent988d9fd8a42b388c30625378dcb521a3b2021b72 (diff)
parent094085e3362c592c932b41525ed37152ec171192 (diff)
downloadgit-3c91bf6805249d0f59ddff4e5dc4118127527243.tar.gz
Merge branch 'jc/maint-1.6.0-keep-pack'
* jc/maint-1.6.0-keep-pack: pack-objects: don't loosen objects available in alternate or kept packs t7700: demonstrate repack flaw which may loosen objects unnecessarily Remove --kept-pack-only option and associated infrastructure pack-objects: only repack or loosen objects residing in "local" packs git-repack.sh: don't use --kept-pack-only option to pack-objects t7700-repack: add two new tests demonstrating repacking flaws Conflicts: t/t7700-repack.sh
Diffstat (limited to 'git-repack.sh')
-rwxr-xr-xgit-repack.sh6
1 files changed, 1 insertions, 5 deletions
diff --git a/git-repack.sh b/git-repack.sh
index 0144c2d7b9..1782a23b26 100755
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -71,11 +71,7 @@ case ",$all_into_one," in
existing="$existing $e"
fi
done
- if test -n "$existing"
- then
- args="--kept-pack-only"
- fi
- if test -n "$args" -a -n "$unpack_unreachable" -a \
+ if test -n "$existing" -a -n "$unpack_unreachable" -a \
-n "$remove_redundant"
then
args="$args $unpack_unreachable"