diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-14 15:59:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-14 15:59:04 -0700 |
| commit | 803527f1d9b284fa848d4a4bad23158c162a5d54 (patch) | |
| tree | ac45529372c3cd8682d6b26b9c8a96002595d326 /git-checkout.sh | |
| parent | c47e6a43d30c8a1fd4b8e9234883f01fe3bac805 (diff) | |
| parent | 3d4e1932f24346d26f15e98dd6a74798035e7870 (diff) | |
| download | git-803527f1d9b284fa848d4a4bad23158c162a5d54.tar.gz | |
Merge GIT 1.5.0.4
Diffstat (limited to 'git-checkout.sh')
| -rwxr-xr-x | git-checkout.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-checkout.sh b/git-checkout.sh index 6caa9fdcc6..fcadf200ee 100755 --- a/git-checkout.sh +++ b/git-checkout.sh @@ -205,7 +205,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 |