X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-repack.sh;h=4fb3f26e834f78d40ea629dcd6732d390a129d58;hb=175fb6c0406e63a10791ab793cdac2acf185eab0;hp=d341966efba783b294792c9a13915982f70a1f73;hpb=72e5890b68e7199d92620d3bba91fa36dd259404;p=git.git

diff --git a/git-repack.sh b/git-repack.sh
index d341966e..4fb3f26e 100755
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -3,17 +3,23 @@
 # Copyright (c) 2005 Linus Torvalds
 #
 
-. git-sh-setup || die "Not a git archive"
-	
-no_update_info= all_into_one= remove_redundant= local=
+USAGE='[-a] [-d] [-f] [-l] [-n] [-q]'
+. git-sh-setup
+
+no_update_info= all_into_one= remove_redundant=
+local= quiet= no_reuse_delta= extra=
 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 ;;
+	--window=*) extra="$extra $1" ;;
+	--depth=*) extra="$extra $1" ;;
+	*)	usage ;;
 	esac
 	shift
 done
@@ -25,40 +31,36 @@ PACKDIR="$GIT_OBJECT_DIRECTORY/pack"
 case ",$all_into_one," in
 ,,)
 	rev_list='--unpacked'
-	rev_parse='--all'
 	pack_objects='--incremental'
 	;;
 ,t,)
 	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
-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$extra"
+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.
-	exit 0
-fi
-echo "Pack pack-$name created."
+else
+	echo "Pack pack-$name created."
 
-mkdir -p "$PACKDIR" || exit
+	mkdir -p "$PACKDIR" || exit
 
-mv .tmp-pack-$name.pack "$PACKDIR/pack-$name.pack" &&
-mv .tmp-pack-$name.idx  "$PACKDIR/pack-$name.idx" ||
-exit
+	mv .tmp-pack-$name.pack "$PACKDIR/pack-$name.pack" &&
+	mv .tmp-pack-$name.idx  "$PACKDIR/pack-$name.idx" ||
+	exit
+fi
 
-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
@@ -73,6 +75,7 @@ then
 		  done
 		)
 	fi
+	git-prune-packed
 fi
 
 case "$no_update_info" in