diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-19 14:48:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-19 14:48:51 -0700 |
| commit | d772def9c835a9521bfa9221a3e39feaf9a7b416 (patch) | |
| tree | 2f7ecc012a9f92a4d1aaf796e00781610534139e /contrib/examples | |
| parent | 44e02239f41177b6a7567e86db2cd18f7949d941 (diff) | |
| parent | 22d6857d46de7ca28445c40782ba87a66416790d (diff) | |
| download | git-d772def9c835a9521bfa9221a3e39feaf9a7b416.tar.gz | |
Merge branch 'mm/pull-upload-pack'
"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.sh: quote $upload_pack when passing it to git-fetch
Diffstat (limited to 'contrib/examples')
| -rwxr-xr-x | contrib/examples/git-pull.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/examples/git-pull.sh b/contrib/examples/git-pull.sh index a814bf61aa..26c5e9ff61 100755 --- 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 $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 |