This is what I have in my ~/.bashrc
export GIT_EDITOR=\'/Applications/MacVim.app/Contents/MacOS/Vim -g \'
When I issue
git comm
I had a similar problem. Adding the --noplungin flag to vim solved it for me.
--noplungin