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 26c5e9ff61477ae523a63b34dcefbc322212a0a7..e8dc2e0e7d5d8fb37f818a05c3ef4c58f28850da 100755 (executable)
--- 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