summaryrefslogtreecommitdiff
path: root/git-repack.sh
diff options
context:
space:
mode:
authorBrandon Casey <casey@nrlssc.navy.mil>2009-03-20 03:47:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-03-20 20:32:33 (GMT)
commit171110a4a67f04c28d2ac89385ab88ba051fc780 (patch)
tree1de92c77d1d69bd486f514e49f80c035240be7bd /git-repack.sh
parent92cd872202241a0b80e88dadac5a4db071c8d1fa (diff)
downloadgit-171110a4a67f04c28d2ac89385ab88ba051fc780.zip
git-171110a4a67f04c28d2ac89385ab88ba051fc780.tar.gz
git-171110a4a67f04c28d2ac89385ab88ba051fc780.tar.bz2
git-repack.sh: don't use --kept-pack-only option to pack-objects
The --kept-pack-only option to pack-objects treats all kept packs as equal. This results in objects that reside in an alternate pack that has a .keep file, not being packed into a newly created pack when the user specifies the -a option to repack. Since the user may not have any control over the alternate database, git should not refrain from repacking those objects even though they are in a pack with a .keep file. This fixes the 'packed obs in alternate ODB kept pack are repacked' test in t7700. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 a736009..e02bf27 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"