diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-24 21:11:27 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-24 21:11:27 +0300 |
| commit | 7ecee3314fdafd8015fd14bfb76ae4b601acc25e (patch) | |
| tree | d4bed4779913c685bff1b58ba7eaa79a0b7b8641 /git-pull.sh | |
| parent | 76c9c0db3d0b9d17ca4dcbb0f9b6678f78a2492c (diff) | |
pull: re-fix command line generation
14e5d40 (pull: Fix parsing of -X<option>, 2010-01-17) forgot that
merge_name needs to stay as a single non-interpolated string.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh index 2de4c3aa70..38331a8611 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -275,7 +275,7 @@ true) *) eval="git-merge $diffstat $no_commit $squash $no_ff $ff_only" eval="$eval $log_arg $strategy_args $merge_args" - eval="$eval \"$merge_name\" HEAD $merge_head $verbosity" + eval="$eval \"\$merge_name\" HEAD $merge_head $verbosity" ;; esac eval "exec $eval" |