diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-25 16:09:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-25 16:09:30 -0700 |
| commit | 33f2c4ff7b9ac02cd9010d504e847b912b35baf6 (patch) | |
| tree | 5fa7f9fa11264128e506cfcbaea148ac869e5b5b /contrib/examples | |
| parent | 8da8889a4bdff30c12b75e36d4b9de4788761ff0 (diff) | |
| parent | 52f6893d356fd04ba350e5b7dd468b2181844521 (diff) | |
| download | git-33f2c4ff7b9ac02cd9010d504e847b912b35baf6.tar.gz git-33f2c4ff7b9ac02cd9010d504e847b912b35baf6.tar.xz | |
Sync with maint
* maint:
pull: pass upload_pack only when it was given
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 26c5e9ff6..e8dc2e0e7 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+"$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 |