projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use a hashtable for objects instead of a sorted list
[git.git]
/
git-repack.sh
diff --git
a/git-repack.sh
b/git-repack.sh
index
b395d0e
..
1fafb6e
100755
(executable)
--- a/
git-repack.sh
+++ b/
git-repack.sh
@@
-3,16
+3,18
@@
# Copyright (c) 2005 Linus Torvalds
#
# Copyright (c) 2005 Linus Torvalds
#
-. git-sh-setup || die "Not a git archive"
+USAGE='[-a] [-d] [-l] [-n]'
+. git-sh-setup
-no_update_info= all_into_one= remove_redundant=
+no_update_info= all_into_one= remove_redundant=
local=
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 ;;
- *) break ;;
+ -d) remove_redundant=t ;;
+ -l) local=t ;;
+ *) usage ;;
esac
shift
done
esac
shift
done
@@
-31,13
+33,16
@@
case ",$all_into_one," in
rev_list=
rev_parse='--all'
pack_objects=
rev_list=
rev_parse='--all'
pack_objects=
- # This part is a stop-gap until we have proper pack redundancy
- #
checker
.
+
+ #
Redundancy check in all-into-one case is trivial
.
existing=`cd "$PACKDIR" && \
find . -type f \( -name '*.pack' -o -name '*.idx' \) -print`
;;
esac
existing=`cd "$PACKDIR" && \
find . -type f \( -name '*.pack' -o -name '*.idx' \) -print`
;;
esac
-name=$(git-rev-list --objects $rev_list $(git-rev-parse $rev_parse) |
+if [ "$local" ]; then
+ pack_objects="$pack_objects --local"
+fi
+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
git-pack-objects --non-empty $pack_objects .tmp-pack) ||
exit 1
if [ -z "$name" ]; then
@@
-52,12
+57,13
@@
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
- # We know $existing are all red
a
ndant only when
+ # We know $existing are all red
u
ndant only when
# all-into-one is used.
if test "$all_into_one" != '' && test "$existing" != ''
then
# all-into-one is used.
if test "$all_into_one" != '' && test "$existing" != ''
then
+ sync
( cd "$PACKDIR" &&
for e in $existing
do
( cd "$PACKDIR" &&
for e in $existing
do