E716: Key not present in Dictionary: "context" when executing Git difftool -y in bare repo

[rockyzhang24]

I'm using git bare repo to manage my dotfiles. In vim, I set the git dir and git work tree by :let $GIT_DIR = '/Users/my-name/.dotfiles' and :let $GIT_WORK_TREE = '/Users/my-name'. Then the error occurs when I execute :Git difftool -y (please see the screenshot below). It works well in normal git repos.

I believe it is caused by this commit (ed9e21f). I reset fugitive to the previous commit and everything works.

Thank you.

[rockyzhang24]

@tpope Thank you for this quick fix.

[rockyzhang24]

After updating, I got another error.