undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests(gpg): allow the gpg-agent to start on Windows

Browse Source 
In Git for Windows' SDK, we use the MSYS2 version of OpenSSH, meaning
that the `gpg-agent` will fail horribly when being passed a `--homedir`
that contains colons.

Previously, we did pass the Windows version of the absolute path,
though, which starts in the drive letter followed by, you guessed it, a
colon.

Let's use the same trick found elsewhere in our test suite where `$PWD`
is used to refer to the pseudo-Unix path (which works only within the
MSYS2 Bash/OpenSSH/Perl/etc, as opposed to `$(pwd)` which refers to the
Windows path that `git.exe` understands, too).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2020-03-25 05:41:17 +00:00 committed by Junio C Hamano
parent 274b9cc253
commit 6c72121c34
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/lib-gpg.sh
View File

@ -29,7 +29,7 @@ then
# > lib-gpg/ownertrust # > lib-gpg/ownertrust
mkdir ./gpghome && mkdir ./gpghome &&
chmod 0700 ./gpghome && chmod 0700 ./gpghome &&
GNUPGHOME="$(pwd)/gpghome" && GNUPGHOME="$PWD/gpghome" &&
export GNUPGHOME && export GNUPGHOME &&
(gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) && (gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) &&
gpg --homedir "${GNUPGHOME}" 2>/dev/null --import \ gpg --homedir "${GNUPGHOME}" 2>/dev/null --import \