Merge branch 'mm/pull-upload-pack' into maint

gitster · gitster · commit 425a4c7734db · 2015-08-25T16:09:15.000-07:00
"git pull" in recent releases of Git has a regression in the code
that allows custom path to the --upload-pack=&lt;program&gt;.  This has
been corrected.

Note that this is irrelevant for 'master' with "git pull" rewritten
in C.

* mm/pull-upload-pack:
  pull: pass upload_pack only when it was given
  pull.sh: quote $upload_pack when passing it to git-fetch
diff --git 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
 

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 $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`