From 8a10a4f79ef818897755b8daf52315c013604d4e Mon Sep 17 00:00:00 2001 From: Oli Scherer Date: Mon, 30 Jan 2023 09:35:05 +0000 Subject: [PATCH 1/2] Add a note for using ssh login with josh --- src/tools/miri/CONTRIBUTING.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/tools/miri/CONTRIBUTING.md b/src/tools/miri/CONTRIBUTING.md index 5b538691de18..f1bbf16fc7ad 100644 --- a/src/tools/miri/CONTRIBUTING.md +++ b/src/tools/miri/CONTRIBUTING.md @@ -242,6 +242,14 @@ josh-proxy --local=$HOME/.cache/josh --remote=https://github.com --no-background This uses a directory `$HOME/.cache/josh` as a cache, to speed up repeated pulling/pushing. +Note that josh is unable to handle ssh auth natively, but you can force it to use ssh auth +by adding the following to your `.gitconfig`: + +```toml +[url "git@github.com:"] + pushInsteadOf = https://github.com/ +``` + ### Importing changes from the rustc repo Josh needs to be running, as described above. From 247a5f3acaee6cdd38476d7d558de2ac0f11489d Mon Sep 17 00:00:00 2001 From: Oli Scherer Date: Tue, 31 Jan 2023 11:27:08 +0100 Subject: [PATCH 2/2] Update CONTRIBUTING.md Co-authored-by: Ralf Jung --- src/tools/miri/CONTRIBUTING.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/tools/miri/CONTRIBUTING.md b/src/tools/miri/CONTRIBUTING.md index f1bbf16fc7ad..476075e9c914 100644 --- a/src/tools/miri/CONTRIBUTING.md +++ b/src/tools/miri/CONTRIBUTING.md @@ -242,8 +242,7 @@ josh-proxy --local=$HOME/.cache/josh --remote=https://github.com --no-background This uses a directory `$HOME/.cache/josh` as a cache, to speed up repeated pulling/pushing. -Note that josh is unable to handle ssh auth natively, but you can force it to use ssh auth -by adding the following to your `.gitconfig`: +To make josh push via ssh instead of https, you can add the following to your `.gitconfig`: ```toml [url "git@github.com:"]