Fix variable name.
USe --keep-display so we don't pass a --display option to the pinentry program.
Make pinentry set the include path explicitly when called from a git repo. The gpg-agent sets the cwd to / when the pinentry is run.