Skip to content

Commit

Permalink
pull: pass upload_pack only when it was given
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Aug 25, 2015
1 parent 22d6857 commit 13e0e28
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-pull.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 13e0e28

Please sign in to comment.