Merge upstream/master

This commit is contained in:
Daniel Carrillo 2020-03-09 19:51:20 +01:00
commit 0c22054a49
2 changed files with 2 additions and 2 deletions

View File

@ -26,7 +26,7 @@ if [[ -z "$GPG_AGENT_INFO" && ! -S "${GNUPGHOME:-$HOME/.gnupg}/S.gpg-agent" ]];
fi
# Inform gpg-agent of the current TTY for user prompts.
export GPG_TTY="$(tty)"
export GPG_TTY=$TTY
# Integrate with the SSH module.
if grep '^enable-ssh-support' "$_gpg_agent_conf" &> /dev/null; then

@ -1 +1 @@
Subproject commit 9d9c50611da19044370ee759e593ccadbad32a6a
Subproject commit 7306efb94ba739f714972038ad74c48d2bebfdd6