From 0cb0c6fadbeb15916f3233668da1e608a7941b36 Mon Sep 17 00:00:00 2001
From: "Kyle J. McKay" <mackyle@gmail.com>
Date: Sat, 30 Dec 2017 00:44:34 -0800
Subject: [PATCH] gc.sh: expand optional arguments with "$@"

None of the optional arguments should ever contain any whitespace.

Previously they've always been expanded using "$@" everywhere.

Update the latest code to also use "$@" instead of a bare $@.

Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
---
 jobd/gc.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/jobd/gc.sh b/jobd/gc.sh
index 76b546d..d9b045e 100755
--- a/jobd/gc.sh
+++ b/jobd/gc.sh
@@ -1228,7 +1228,7 @@ sleep 1
 # optimized packs to be generated even for repositories that do not have any
 # tagged commits
 packs="$(git --git-dir=repack pack-objects </dev/null \
-	$pkopt --all $newdeltas $lclopt ${wbmopt:---honor-pack-keep} $@ repack/alt/pack/pack)"
+	$pkopt --all $newdeltas $lclopt ${wbmopt:---honor-pack-keep} "$@" repack/alt/pack/pack)"
 vcnt packcnt $packs
 [ $packcnt -eq 1 ] || makebndl=
 
@@ -1256,7 +1256,7 @@ export GIT_ALTERNATE_OBJECT_DIRECTORIES
 rflopt=
 ! [ -d logs ] && ! [ -d worktrees ] || rflopt=--reflog
 spacks="$(git --git-dir=repack pack-objects </dev/null \
-	$pkopt --honor-pack-keep --all $rflopt $newdeltas --local $@ repack/alt/pack/pack)"
+	$pkopt --honor-pack-keep --all $rflopt $newdeltas --local "$@" repack/alt/pack/pack)"
 
 #
 ## Phase III
@@ -1289,14 +1289,14 @@ if [ -n "$gotforks" ]; then
 	pfx=
 	[ -z "$newdeltas" ] || pfx="ku"
 	upacks="$(git --git-dir=repack pack-objects </dev/null \
-		$pkopt --honor-pack-keep --all $rflopt --keep-unreachable --local $@ repack/alt/pack/${pfx}pack)"
+		$pkopt --honor-pack-keep --all $rflopt --keep-unreachable --local "$@" repack/alt/pack/${pfx}pack)"
 	if [ -n "$upacks" ] && [ -n "$newdeltas" ]; then
 		progress "~ [$proj] rebuilding keep-unreachable pack deltas"
 		oldupacks="$upacks"
 		upacks="$(
 			printf "repack/alt/pack/${pfx}pack-%s.pack\n" $oldupacks |
 			run_combine_packs --names --weak-naming --non-empty --all-progress-implied ${quiet:---progress} \
-				$packopts $newdeltas $@ repack/alt/pack/pack)"
+				$packopts $newdeltas "$@" repack/alt/pack/pack)"
 		eval rm -f "$(printf \""repack/alt/pack/${pfx}pack-%s.*"\"" " $oldupacks)"
 	fi
 	for upack in $upacks; do
@@ -1417,7 +1417,7 @@ progress "~ [$proj] running loose objects gc pack-objects"
 #  1) We're not interested in expensive "unreachable" at this point, only "loose"
 #  2) It produces simply horrid packs about 3.8x times larger than they should be
 #  3) We don't require anything more than Git v1.6.6
-lpacks="$(run_combine_packs </dev/null --names --loose --weak-naming --non-empty --all-progress-implied ${quiet:---progress} $packopts $newdeltas $@)"
+lpacks="$(run_combine_packs </dev/null --names --loose --weak-naming --non-empty --all-progress-implied ${quiet:---progress} $packopts $newdeltas "$@")"
 
 if [ -n "$lpacks" ]; then
 	# Make sure any primary pack(s) have a more recent mod time than "unreachable" objects packs
-- 
2.11.4.GIT