projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
applypatch: use "index" lines not "applies-to".
[git.git]
/
git-repack.sh
diff --git
a/git-repack.sh
b/git-repack.sh
index
f347207
..
430ddc5
100755
(executable)
--- a/
git-repack.sh
+++ b/
git-repack.sh
@@
-3,7
+3,7
@@
# Copyright (c) 2005 Linus Torvalds
#
# Copyright (c) 2005 Linus Torvalds
#
-. git-sh-setup
|| die "Not a git archive"
+. git-sh-setup
no_update_info= all_into_one= remove_redundant= local=
while case "$#" in 0) break ;; esac
no_update_info= all_into_one= remove_redundant= local=
while case "$#" in 0) break ;; esac
@@
-11,7
+11,7
@@
do
case "$1" in
-n) no_update_info=t ;;
-a) all_into_one=t ;;
case "$1" in
-n) no_update_info=t ;;
-a) all_into_one=t ;;
- -d) remove_red
a
ndant=t ;;
+ -d) remove_red
u
ndant=t ;;
-l) local=t ;;
*) break ;;
esac
-l) local=t ;;
*) break ;;
esac
@@
-32,24
+32,20
@@
case ",$all_into_one," in
rev_list=
rev_parse='--all'
pack_objects=
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
pack_objects="$pack_objects --local"
fi
;;
esac
if [ "$local" ]; then
pack_objects="$pack_objects --local"
fi
-name=$(git-rev-list --objects $rev_list $(git-rev-parse $rev_parse) |
+name=$(git-rev-list --objects $rev_list $(git-rev-parse $rev_parse)
2>&1
|
git-pack-objects --non-empty $pack_objects .tmp-pack) ||
exit 1
if [ -z "$name" ]; then
echo Nothing new to pack.
git-pack-objects --non-empty $pack_objects .tmp-pack) ||
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-redundant --all)
- if test "$redundant" != "" ; then
- echo $redundant | xargs rm
- fi
- fi
exit 0
fi
echo "Pack pack-$name created."
exit 0
fi
echo "Pack pack-$name created."
@@
-60,12
+56,22
@@
mv .tmp-pack-$name.pack "$PACKDIR/pack-$name.pack" &&
mv .tmp-pack-$name.idx "$PACKDIR/pack-$name.idx" ||
exit
mv .tmp-pack-$name.idx "$PACKDIR/pack-$name.idx" ||
exit
-if test "$remove_red
a
ndant" = t
+if test "$remove_red
u
ndant" = t
then
then
- sync
- redundant=$(git-pack-redundant --all)
- if test "$redundant" != "" ; then
- echo $redundant | xargs rm
+ # We know $existing are all redundant 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
+ )
fi
fi
fi
fi