summaryrefslogtreecommitdiff
path: root/git-repack.sh
diff options
context:
space:
mode:
authorLukas_Sandström <lukass@etek.chalmers.se>2005-11-09 01:25:48 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-12 05:19:11 (GMT)
commitb4ad3552de8b3231b55f5ee32ee2178202708118 (patch)
tree8b59a74f61dceb8ab932b765076884d69390d843 /git-repack.sh
parent523114820233f87b663513ee0bf52a6f7fdd9cfc (diff)
downloadgit-b4ad3552de8b3231b55f5ee32ee2178202708118.zip
git-b4ad3552de8b3231b55f5ee32ee2178202708118.tar.gz
git-b4ad3552de8b3231b55f5ee32ee2178202708118.tar.bz2
Make git-repack use git-pack-intersect.
Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-repack.sh')
-rwxr-xr-xgit-repack.sh30
1 files changed, 12 insertions, 18 deletions
diff --git a/git-repack.sh b/git-repack.sh
index d341966..3f28300 100755
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -32,10 +32,6 @@ case ",$all_into_one," in
rev_list=
rev_parse='--all'
pack_objects=
- # This part is a stop-gap until we have proper pack redundancy
- # checker.
- existing=`cd "$PACKDIR" && \
- find . -type f \( -name '*.pack' -o -name '*.idx' \) -print`
;;
esac
if [ "$local" ]; then
@@ -46,6 +42,14 @@ name=$(git-rev-list --objects $rev_list $(git-rev-parse $rev_parse) |
exit 1
if [ -z "$name" ]; then
echo Nothing new to pack.
+ if test "$remove_redandant" = t ; then
+ echo "Removing redundant packs."
+ sync
+ redundant=$(git-pack-intersect -a)
+ if test "$redundant" != "" ; then
+ echo $redundant | xargs rm
+ fi
+ fi
exit 0
fi
echo "Pack pack-$name created."
@@ -58,20 +62,10 @@ exit
if test "$remove_redandant" = t
then
- # We know $existing are all redandant only when
- # all-into-one is used.
- if test "$all_into_one" != '' && test "$existing" != ''
- then
- sync
- ( cd "$PACKDIR" &&
- for e in $existing
- do
- case "$e" in
- ./pack-$name.pack | ./pack-$name.idx) ;;
- *) rm -f $e ;;
- esac
- done
- )
+ sync
+ redundant=$(git-pack-intersect -a)
+ if test "$redundant" != "" ; then
+ echo $redundant | xargs rm
fi
fi