[PATCH 4/4] Make git-repack use git-pack-intersect
From: Lukas Sandström <hidden>
Date: 2016-06-15 22:42:11
Subsystem:
the rest · Maintainer:
Linus Torvalds
Make git-repack use git-pack-intersect. Signed-off-by: Lukas Sandström <redacted> --- git-repack.sh | 30 ++++++++++++------------------ 1 files changed, 12 insertions(+), 18 deletions(-) applies-to: 73e05dab832dd7320a5128fbf97e693f23ffb949 2cbd6ade19a768eca47f6f7313f6831226ee58b7
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 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
--- 0.99.9.GIT