Re: [PATCH 3/5] ssh: 'auto' variant to select between 'ssh' and 'simple'
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 30, 2017, 00:40 UTC
- Message-ID
- <xmqqo9op8o35.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <20171025163243.xmm7szrkwgblpgcc@aiede.mtv.corp.google.com>
Jonathan Nieder <jrnieder@gmail.com> writes:
Show 5 quoted lines
> I have other changes to make when rerolling anyway (from Junio's > review), so no need for a followup patch. Will fix this in the > reroll today. > > Thanks for catching and diagnosing this, Dscho!
In the meantime, I've queued this from Dscho; please take it into consideration when you reroll.
Thanks.
-- >8 -- From: Johannes Schindelin <johannes.schindelin@gmx.de> Date: Sun, 29 Oct 2017 16:12:46 +0100 Subject: [PATCH] fixup! ssh: 'auto' variant to select between 'ssh' and 'simple'
This is needed because on Windows, if `uplink.exe` exists, the MSYS2 Bash will overwrite that when redirecting via `>uplink`.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- t/t5601-clone.sh | 1 + 1 file changed, 1 insertion(+)
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh index f9a2ae84c7..534eb21915 100755 --- a/t/t5601-clone.sh +++ b/t/t5601-clone.sh @@ -391,6 +391,7 @@ test_expect_success 'simple does not support port' ' test_expect_success 'uplink is treated as simple' ' copy_ssh_wrapper_as "$TRASH_DIRECTORY/uplink" && + test_when_finished "rm \"$TRASH_DIRECTORY/uplink$X\"" && test_must_fail git clone "[myhost:123]:src" ssh-bracket-clone-uplink && git clone "myhost:src" ssh-clone-uplink && expect_ssh myhost src
-- 2.15.0-rc2-267-g7d3ed0014a