fast-import: die_nicely() back to vsnprintf (reverts part of ebaa79f)

[git.git] / git-pull.sh

diff --git a/git-pull.sh b/git-pull.sh
index 2de4c3aa70c10203aebe4e117b30422e39f41e02..38331a861106c63bf5f421dbe03f4aafe949812e 100755 (executable)
--- 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"