X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-repack.sh;h=156c5e8f4aa2f6c04e33af323ef43356fd336adb;hb=17437d45becdc373b171092e09a7853e6b286084;hp=8c32724be75b77f145106f96257afccb56cfc1ef;hpb=17c2929aa2ed999cbefa75ca5e933e1bf53a95bf;p=git.git

diff --git a/git-repack.sh b/git-repack.sh
index 8c32724be..156c5e8f4 100755
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2005 Linus Torvalds
 #
 
-USAGE='[-a] [-d] [-f] [-l] [-n] [-q] [--max-pack-size=N] [--window=N] [--depth=N]'
+USAGE='[-a] [-d] [-f] [-l] [-n] [-q] [--max-pack-size=N] [--window=N] [--window-memory=N] [--depth=N]'
 SUBDIRECTORY_OK='Yes'
 . git-sh-setup
 
@@ -20,6 +20,7 @@ do
 	-l)	local=--local ;;
 	--max-pack-size=*) extra="$extra $1" ;;
 	--window=*) extra="$extra $1" ;;
+	--window-memory=*) extra="$extra $1" ;;
 	--depth=*) extra="$extra $1" ;;
 	*)	usage ;;
 	esac
@@ -63,10 +64,12 @@ case ",$all_into_one," in
 esac
 
 args="$args $local $quiet $no_reuse$extra"
-names=$(git-pack-objects --non-empty --all --reflog $args </dev/null "$PACKTMP") ||
+names=$(git pack-objects --non-empty --all --reflog $args </dev/null "$PACKTMP") ||
 	exit 1
 if [ -z "$names" ]; then
-	echo Nothing new to pack.
+	if test -z "$quiet"; then
+		echo Nothing new to pack.
+	fi
 fi
 for name in $names ; do
 	fullbases="$fullbases pack-$name"
@@ -113,7 +116,7 @@ then
 		  done
 		)
 	fi
-	git-prune-packed $quiet
+	git prune-packed $quiet
 fi
 
 case "$no_update_info" in