pull: pass upload_pack only when it was given
The upload_pack shell variable is initialized to an empty string, so conditional expansion with ${upload_pack+"$upload_pack"} would not work very well. You need a colon there. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Aug 25, 2015 at 16:06 UTC
13e0e28f530ae3e337c95b2e5c524f6904968cc0
1 file changed
+1
-1
git-pull.sh
+1
-1
@@ -295,7 +295,7 @@ test true = "$rebase" && {
295
}
296
orig_head=$(git rev-parse -q --verify HEAD)
297
git fetch $verbosity $progress $dry_run $recurse_submodules $all $append \
298
-${upload_pack+"$upload_pack"} $force $tags $prune $keep $depth $unshallow $update_shallow \
298
+${upload_pack:+"$upload_pack"} $force $tags $prune $keep $depth $unshallow $update_shallow \
299
$refmap --update-head-ok "$@" || exit 1
300
test -z "$dry_run" || exit 0
301