From: Matthieu Moy <Matthieu.Moy@imag.fr>
Date: Thu, 30 Jul 2015 20:40:03 +0000 (+0200)
Subject: pull.sh: quote $upload_pack when passing it to git-fetch
X-Git-Tag: v2.5.1~5^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=22d6857d46de7ca28445c40782ba87a66416790d;p=thirdparty%2Fgit.git

pull.sh: quote $upload_pack when passing it to git-fetch

The previous code broke for example

  git pull --upload-pack 'echo --foo'

Reported-by: Joey Hess <id@joeyh.name>
Fix-suggested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-pull.sh b/git-pull.sh
index a814bf61aa..26c5e9ff61 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -295,7 +295,7 @@ test true = "$rebase" && {
 }
 orig_head=$(git rev-parse -q --verify HEAD)
 git fetch $verbosity $progress $dry_run $recurse_submodules $all $append \
-$upload_pack $force $tags $prune $keep $depth $unshallow $update_shallow \
+${upload_pack+"$upload_pack"} $force $tags $prune $keep $depth $unshallow $update_shallow \
 $refmap --update-head-ok "$@" || exit 1
 test -z "$dry_run" || exit 0