Merge branch 'mm/pull-upload-pack' into maint
commit425a4c7734db768d93d3b35c2d26ae50d22893c0
authorJunio C Hamano <gitster@pobox.com>
Tue, 25 Aug 2015 23:09:15 +0000 (25 16:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 25 Aug 2015 23:09:15 +0000 (25 16:09 -0700)
tree7deb3be2b4d23b21bf9579a0cfba6ed911a14be7
parent552a736de775994570570a0514f24e32686afbe0
parent13e0e28f530ae3e337c95b2e5c524f6904968cc0
Merge branch 'mm/pull-upload-pack' into maint

"git pull" in recent releases of Git has a regression in the code
that allows custom path to the --upload-pack=<program>.  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