[PATCH v2 1/5] tests(gpg): allow the gpg-agent to start on Windows
- From
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Mar 25, 2020, 05:41 UTC
- Message-ID
- <287a21f1033b2a74420029c529ad4db956051a85.1585114881.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.728.v2.git.git.1585114881.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>
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> --- t/lib-gpg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh index 8d28652b729..11b83b8c24a 100755 --- a/t/lib-gpg.sh +++ b/t/lib-gpg.sh @@ -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 \
-- gitgitgadget