Sync with maint

gitster · gitster · commit 33f2c4ff7b9a · 2015-08-25T16:09:30.000-07:00
* maint:
  pull: pass upload_pack only when it was given
diff --git 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
 

Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ test true = "$rebase" && {`
`295`	`295`	`}`
`296`	`296`	`orig_head=$(git rev-parse -q --verify HEAD)`
`297`	`297`	`git fetch $verbosity $progress $dry_run $recurse_submodules $all $append \`
`298`		`-${upload_pack+"$upload_pack"} $force $tags $prune $keep $depth $unshallow $update_shallow \`
	`298`	`+${upload_pack:+"$upload_pack"} $force $tags $prune $keep $depth $unshallow $update_shallow \`
`299`	`299`	`$refmap --update-head-ok "$@" \|\| exit 1`
`300`	`300`	`test -z "$dry_run" \|\| exit 0`
`301`	`301`