]> git.ipfire.org Git - thirdparty/git.git/commitdiff
tests(gpg): allow the gpg-agent to start on Windows
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 25 Mar 2020 05:41:17 +0000 (05:41 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Mar 2020 17:12:46 +0000 (10:12 -0700)
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>
t/lib-gpg.sh

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