diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-25 16:09:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-25 16:09:15 -0700 |
| commit | 425a4c7734db768d93d3b35c2d26ae50d22893c0 (patch) | |
| tree | 7deb3be2b4d23b21bf9579a0cfba6ed911a14be7 | |
| parent | 552a736de775994570570a0514f24e32686afbe0 (diff) | |
| parent | 13e0e28f530ae3e337c95b2e5c524f6904968cc0 (diff) | |
| download | git-425a4c7734db768d93d3b35c2d26ae50d22893c0.tar.gz git-425a4c7734db768d93d3b35c2d26ae50d22893c0.tar.xz | |
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
| -rwxr-xr-x | git-pull.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh index a814bf61a..e8dc2e0e7 100755 --- 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 |