X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-repack.sh;h=49547a77c75356fb12dc3c9451a8983e06f81240;hb=e24317b4d093e4b148996172d0b749f09a0e6f2e;hp=064c85cbb624ebaa7a9a5776328afe7063126395;hpb=215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7;p=git.git

diff --git a/git-repack.sh b/git-repack.sh
index 064c85cb..49547a77 100755
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -5,13 +5,14 @@
 
 . git-sh-setup || die "Not a git archive"
 	
-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 ;;
 	-d)	remove_redandant=t ;;
+	-l)	local=t ;;
 	*)	break ;;
 	esac
 	shift
@@ -37,6 +38,9 @@ case ",$all_into_one," in
 	    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) |
 	git-pack-objects --non-empty $pack_objects .tmp-pack) ||
 	exit 1
@@ -58,7 +62,15 @@ then
 	# all-into-one is used.
 	if test "$all_into_one" != '' && test "$existing" != ''
 	then
-		( cd "$PACKDIR" && rm -f $existing )
+		( cd "$PACKDIR" &&
+		  for e in $existing
+		  do
+			case "$e" in
+			./pack-$name.pack | ./pack-$name.idx) ;;
+			*)	rm -f $e ;;
+			esac
+		  done
+		)
 	fi
 fi