summaryrefslogtreecommitdiff
path: root/git-repack.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-19 20:13:53 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-19 20:13:53 (GMT)
commit6ed64058e1241f9939c4abf5d6a9eaed6a2cc795 (patch)
tree8839be40e9401452691ae1b0bf4c86ac616b7bb6 /git-repack.sh
parenta4caa5214058ad7e2bc7b74e989d6b3ffb47bec3 (diff)
downloadgit-6ed64058e1241f9939c4abf5d6a9eaed6a2cc795.zip
git-6ed64058e1241f9939c4abf5d6a9eaed6a2cc795.tar.gz
git-6ed64058e1241f9939c4abf5d6a9eaed6a2cc795.tar.bz2
git-repack: do not do complex redundancy check.
With "-a", redundant pack removal is trivial, and otherwise redundant pack removal is pointless; do not call git-redundant-pack from this script. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-repack.sh')
-rwxr-xr-xgit-repack.sh35
1 files changed, 14 insertions, 21 deletions
diff --git a/git-repack.sh b/git-repack.sh
index 55a7b27..4e16d34 100755
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -32,6 +32,10 @@ case ",$all_into_one," in
rev_list=
rev_parse='--all'
pack_objects=
+
+ # Redundancy check in all-into-one case is trivial.
+ existing=`cd "$PACKDIR" && \
+ find . -type f \( -name '*.pack' -o -name '*.idx' \) -print`
;;
esac
if [ "$local" ]; then
@@ -42,14 +46,6 @@ 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_redundant" = t ; then
- echo "Removing redundant packs."
- sync
- redundant=$(git-pack-redundant --all)
- if test "$redundant" != "" ; then
- echo $redundant | xargs rm
- fi
- fi
exit 0
fi
echo "Pack pack-$name created."
@@ -62,23 +58,20 @@ exit
if test "$remove_redundant" = t
then
- sync
- if test "$all_into_one" = t
+ # We know $existing are all redundant only when
+ # all-into-one is used.
+ if test "$all_into_one" != '' && test "$existing" != ''
then
- cd "$PACKDIR"
- existing=`find . -type f \( -name '*.pack' -o -name '*.idx' \) -print`
- for e in $existing
- do
+ sync
+ ( cd "$PACKDIR" &&
+ for e in $existing
+ do
case "$e" in
./pack-$name.pack | ./pack-$name.idx) ;;
- *) rm -f $e ;;
+ *) rm -f $e ;;
esac
- done
- else
- redundant=$(git-pack-redundant --all)
- if test "$redundant" != "" ; then
- echo $redundant | xargs rm
- fi
+ done
+ )
fi
fi