From 41f5d73391e3fe5c4cb2829582b26a85930964d1 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 14 Mar 2007 09:48:13 -0700 Subject: git-checkout: fix "eval" used for merge labelling. The symbolic notation of the fork point can contain whitespaces (e.g. "git checkout -m 'HEAD@{9 hours ago}'"). Quote strings properly when using eval to prepare GITHEAD_$new Signed-off-by: Junio C Hamano --- git-checkout.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git-checkout.sh') diff --git a/git-checkout.sh b/git-checkout.sh index 14835a4aa9..83b2639d6f 100755 --- a/git-checkout.sh +++ b/git-checkout.sh @@ -196,7 +196,7 @@ else work=`git write-tree` && git read-tree --reset -u $new || exit - eval GITHEAD_$new=${new_name:-${branch:-$new}} && + eval GITHEAD_$new='${new_name:-${branch:-$new}}' && eval GITHEAD_$work=local && export GITHEAD_$new GITHEAD_$work && git merge-recursive $old -- $new $work -- cgit v1.2.3