summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Matthieu Moy <Matthieu.Moy@imag.fr>2015-07-30 22:40:03 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-07-30 14:14:32 -0700
commit22d6857d46de7ca28445c40782ba87a66416790d (patch)
tree3d7145d2b2daadbba65d30ee3e7be687e4367dd0
parentpull: use git-rev-parse --parseopt for option parsing (diff)
downloadtgif-22d6857d46de7ca28445c40782ba87a66416790d.tar.xz
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>
-rwxr-xr-xgit-pull.sh2
1 files changed, 1 insertions, 1 deletions
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