From: Junio C Hamano <junkio@cox.net>
Date: Mon, 18 Sep 2006 09:29:01 +0000 (-0700)
Subject: repack: use only pack-objects, not rev-list.
X-Git-Tag: v1.4.3-rc1~23^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=cd0d74d2f9c7578b36e705dda55f79731dbe9696;p=git.git

repack: use only pack-objects, not rev-list.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-repack.sh b/git-repack.sh
index b525fc5df..9ae509220 100755
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -32,12 +32,10 @@ trap 'rm -f "$PACKTMP"-*' 0 1 2 3 15
 # There will be more repacking strategies to come...
 case ",$all_into_one," in
 ,,)
-	rev_list='--unpacked'
-	pack_objects='--incremental'
+	args='--unpacked --incremental'
 	;;
 ,t,)
-	rev_list=
-	pack_objects=
+	args=
 
 	# Redundancy check in all-into-one case is trivial.
 	existing=`test -d "$PACKDIR" && cd "$PACKDIR" && \
@@ -45,11 +43,8 @@ case ",$all_into_one," in
 	;;
 esac
 
-pack_objects="$pack_objects $local $quiet $no_reuse_delta$extra"
-name=$( { git-rev-list --objects --all $rev_list ||
-	  echo "git-rev-list died with exit code $?"
-	} |
-	git-pack-objects --non-empty $pack_objects "$PACKTMP") ||
+args="$args $local $quiet $no_reuse_delta$extra"
+name=$(git-pack-objects --non-empty --all $args </dev/null "$PACKTMP") ||
 	exit 1
 if [ -z "$name" ]; then
 	echo Nothing new to pack.