Sync with maint

* maint:
  pull: pass upload_pack only when it was given
This commit is contained in:
Junio C Hamano 2015-08-25 16:09:30 -07:00
commit 33f2c4ff7b

View File

@ -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