X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-repack.sh;h=1fafb6ecf6ffbac817865470ec923af203da8e7e;hb=3af06987eb3c376e2f1cc6dfa9c9c510b9e228cf;hp=49547a77c75356fb12dc3c9451a8983e06f81240;hpb=8ac3a61f59173d4a9a328518be83a25df610a5ef;p=git.git

diff --git a/git-repack.sh b/git-repack.sh
index 49547a77..1fafb6ec 100755
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -3,7 +3,8 @@
 # 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= local=
 while case "$#" in 0) break ;; esac
@@ -11,9 +12,9 @@ do
 	case "$1" in
 	-n)	no_update_info=t ;;
 	-a)	all_into_one=t ;;
-	-d)	remove_redandant=t ;;
+	-d)	remove_redundant=t ;;
 	-l)	local=t ;;
-	*)	break ;;
+	*)	usage ;;
 	esac
 	shift
 done
@@ -32,8 +33,8 @@ case ",$all_into_one," in
 	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`
 	;;
@@ -41,7 +42,7 @@ 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
@@ -56,12 +57,13 @@ mv .tmp-pack-$name.pack "$PACKDIR/pack-$name.pack" &&
 mv .tmp-pack-$name.idx  "$PACKDIR/pack-$name.idx" ||
 exit
 
-if test "$remove_redandant" = t
+if test "$remove_redundant" = t
 then
-	# We know $existing are all redandant only when
+	# 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