From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 25 Aug 2015 23:09:30 +0000 (-0700)
Subject: Sync with maint
X-Git-Tag: v2.6.0-rc0~43
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/33f2c4ff7b9ac02cd9010d504e847b912b35baf6?hp=8da8889a4bdff30c12b75e36d4b9de4788761ff0

Sync with maint

* maint:
pull: pass upload_pack only when it was given
---

diff --git a/contrib/examples/git-pull.sh b/contrib/examples/git-pull.sh
index 26c5e9ff61..e8dc2e0e7d 100755
--- a/contrib/examples/git-pull.sh
+++ b/contrib/examples/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+"$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