projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-config-set: Properly terminate strings with '\0'
[git.git]
/
git-repack.sh
diff --git
a/git-repack.sh
b/git-repack.sh
index
55a7b27
..
4e16d34
100755
(executable)
--- a/
git-repack.sh
+++ b/
git-repack.sh
@@
-32,6
+32,10
@@
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
;;
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.
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."
exit 0
fi
echo "Pack pack-$name created."
@@
-62,23
+58,20
@@
exit
if test "$remove_redundant" = t
then
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
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) ;;
case "$e" in
./pack-$name.pack | ./pack-$name.idx) ;;
- *) rm -f $e ;;
+ *) rm -f $e ;;
esac
esac
- done
- else
- redundant=$(git-pack-redundant --all)
- if test "$redundant" != "" ; then
- echo $redundant | xargs rm
- fi
+ done
+ )
fi
fi
fi
fi