projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix trivial typo in git-log man page.
[git.git]
/
git-repack.sh
diff --git
a/git-repack.sh
b/git-repack.sh
index
4ce0022
..
a5d349f
100755
(executable)
--- a/
git-repack.sh
+++ b/
git-repack.sh
@@
-3,17
+3,21
@@
# Copyright (c) 2005 Linus Torvalds
#
# Copyright (c) 2005 Linus Torvalds
#
-. git-sh-setup || die "Not a git archive"
+USAGE='[-a] [-d] [-f] [-l] [-n] [-q]'
+. git-sh-setup
-no_update_info= all_into_one= remove_redundant= local=
+no_update_info= all_into_one= remove_redundant=
+local= quiet= no_reuse_delta=
while case "$#" in 0) break ;; esac
do
case "$1" in
-n) no_update_info=t ;;
-a) all_into_one=t ;;
while case "$#" in 0) break ;; esac
do
case "$1" in
-n) no_update_info=t ;;
-a) all_into_one=t ;;
- -d) remove_redandant=t ;;
- -l) local=t ;;
- *) break ;;
+ -d) remove_redundant=t ;;
+ -q) quiet=-q ;;
+ -f) no_reuse_delta=--no-reuse-delta ;;
+ -l) local=--local ;;
+ *) usage ;;
esac
shift
done
esac
shift
done
@@
-25,31
+29,23
@@
PACKDIR="$GIT_OBJECT_DIRECTORY/pack"
case ",$all_into_one," in
,,)
rev_list='--unpacked'
case ",$all_into_one," in
,,)
rev_list='--unpacked'
- rev_parse='--all'
pack_objects='--incremental'
;;
,t,)
rev_list=
pack_objects='--incremental'
;;
,t,)
rev_list=
- rev_parse='--all'
pack_objects=
pack_objects=
+
+ # Redundancy check in all-into-one case is trivial.
+ existing=`cd "$PACKDIR" && \
+ find . -type f \( -name '*.pack' -o -name '*.idx' \) -print`
;;
esac
;;
esac
-if [ "$local" ]; then
- pack_objects="$pack_objects --local"
-fi
-name=$(git-rev-list --objects $rev_list $(git-rev-parse $rev_parse) |
+pack_objects="$pack_objects $local $quiet $no_reuse_delta"
+name=$(git-rev-list --objects --all $rev_list 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 -a)
- 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,13
+56,24
@@
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 -a)
- 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
+ git-prune-packed
fi
case "$no_update_info" in
fi
case "$no_update_info" in