git-repack: do not do complex redundancy check.

With "-a", redundant pack removal is trivial, and otherwise
redundant pack removal is pointless; do not call
git-redundant-pack from this script.

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

git-repack.sh

@@ -32,6 +32,10 @@ case ",$all_into_one," in
 	rev_list=
 	rev_parse='--all'
 	pack_objects=
+
+	# 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
@@ -42,14 +46,6 @@ name=$(git-rev-list --objects $rev_list $(git-rev-parse $rev_parse) |
 	exit 1
 if [ -z "$name" ]; then
 	echo Nothing new to pack.
-	if test "$remove_redundant" = t ; then
-		echo "Removing redundant packs."
-		sync
-		redundant=$(git-pack-redundant --all)
-		if test "$redundant" != "" ; then
-			echo $redundant | xargs rm
-		fi
-	fi
 	exit 0
 fi
 echo "Pack pack-$name created."
@@ -62,11 +58,12 @@ exit
 
 if test "$remove_redundant" = t
 then
-	sync
+	# We know $existing are all redundant only when
-	if test "$all_into_one" = t
+	# all-into-one is used.
+	if test "$all_into_one" != '' && test "$existing" != ''
 	then
-		cd "$PACKDIR"
+		sync
-		existing=`find . -type f \( -name '*.pack' -o -name '*.idx' \) -print`
+		( cd "$PACKDIR" &&
 		  for e in $existing
 		  do
 			case "$e" in
@@ -74,11 +71,7 @@ then
 			*)	rm -f $e ;;
 			esac
 		  done
-	else
+		)
-		redundant=$(git-pack-redundant --all)
-		if test "$redundant" != "" ; then
-			echo $redundant | xargs rm
-		fi
 	fi
 fi