Re: [BUG] having 'plink' anywhere in the GIT_SSH environment variables sets putty = true

2015-04-23 Thread Patrick Sharp
Torsten, The relevant part of the path in GIT_SSH was ‘/uplink_deploy/‘. I did begin to use GIT_SSH_COMMAND as a workaround, but regardless this still feels like an overly broad way to determine the value of the putty flag. I was kind of surprised to find it being inferred from the value of

[BUG] having 'plink' anywhere in the GIT_SSH environment variables sets putty = true

2015-04-22 Thread Patrick Sharp
The plink string detection in GIT_SSH for setting putty to true is very broad. If plink is anywhere in the path to the shell file then putty gets set to true and ssh will fail trying to parse -batch as the hostname. Wouldn’t searching for plink.exe be better?-- To unsubscribe from this list:

Re: [BUG] having 'plink' anywhere in the GIT_SSH environment variables sets putty = true

2015-04-22 Thread Johannes Schindelin
Hi Patrick, On 2015-04-22 16:36, Patrick Sharp wrote: The plink string detection in GIT_SSH for setting putty to true is very broad. Wow. You probably wanted to state that you are using Windows, downloaded Git from [link here], that you are using [version] and that you use PLink [version]

Re: [BUG] having 'plink' anywhere in the GIT_SSH environment variables sets putty = true

2015-04-22 Thread Patrick Sharp
Johannes, You’re correct, looking back over it, I was pretty vague. In truth, we are not using Windows OR putty at all. Running git on an Ubuntu system, but we are setting the GIT_SSH environment variable to point to a shell script to use. Upon attempting to run git ls-remote, the system was

Re: [BUG] having 'plink' anywhere in the GIT_SSH environment variables sets putty = true

2015-04-22 Thread brian m. carlson
On Wed, Apr 22, 2015 at 05:29:04PM -0400, Jeff King wrote: Perhaps it would be worthwhile to check instead if the text plink is the beginning of string or is preceded by a path separator. That would give us a bit more confidence that the user is looking for plink, but would still allow

Re: [BUG] having 'plink' anywhere in the GIT_SSH environment variables sets putty = true

2015-04-22 Thread Jeff King
On Wed, Apr 22, 2015 at 09:44:45PM +, brian m. carlson wrote: On Wed, Apr 22, 2015 at 05:29:04PM -0400, Jeff King wrote: Perhaps it would be worthwhile to check instead if the text plink is the beginning of string or is preceded by a path separator. That would give us a bit more

Re: [BUG] having 'plink' anywhere in the GIT_SSH environment variables sets putty = true

2015-04-22 Thread Jeff King
On Wed, Apr 22, 2015 at 10:24:55PM +, brian m. carlson wrote: On Wed, Apr 22, 2015 at 06:00:54PM -0400, Jeff King wrote: Yeah, that looks right to me. You might want to represent the are we tortoise check as a separate flag, though, and reuse it a few lines later. Sounds like a good

Re: [BUG] having 'plink' anywhere in the GIT_SSH environment variables sets putty = true

2015-04-22 Thread brian m. carlson
On Wed, Apr 22, 2015 at 04:29:10PM -0400, Jeff King wrote: I think you want something like: diff --git a/connect.c b/connect.c index 9ae991a..58aad56 100644 --- a/connect.c +++ b/connect.c @@ -568,7 +568,8 @@ struct child_process *git_connect(int fd[2], const char *url_orig,

Re: [BUG] having 'plink' anywhere in the GIT_SSH environment variables sets putty = true

2015-04-22 Thread brian m. carlson
On Wed, Apr 22, 2015 at 06:00:54PM -0400, Jeff King wrote: Yeah, that looks right to me. You might want to represent the are we tortoise check as a separate flag, though, and reuse it a few lines later. Sounds like a good idea. I'll send a more formal patch a bit later today. Also, not

Re: [BUG] having 'plink' anywhere in the GIT_SSH environment variables sets putty = true

2015-04-22 Thread Torsten Bögershausen
On 04/22/2015 09:12 PM, Patrick Sharp wrote: Johannes, You’re correct, looking back over it, I was pretty vague. In truth, we are not using Windows OR putty at all. Running git on an Ubuntu system, but we are setting the GIT_SSH environment variable to point to a shell script to use. Upon

Re: [BUG] having 'plink' anywhere in the GIT_SSH environment variables sets putty = true

2015-04-22 Thread Jeff King
On Wed, Apr 22, 2015 at 02:12:53PM -0500, Patrick Sharp wrote: Johannes, You’re correct, looking back over it, I was pretty vague. In truth, we are not using Windows OR putty at all. Running git on an Ubuntu system, but we are setting the GIT_SSH environment variable to point to a

Re: [BUG] having 'plink' anywhere in the GIT_SSH environment variables sets putty = true

2015-04-22 Thread Jeff King
On Wed, Apr 22, 2015 at 09:19:15PM +, brian m. carlson wrote: Note that I don't think just switching the strcasestr to look for plink.exe is right. For one thing, it just punts on the problem (it can still happen, it's just less likely to trigger). But for another, you can have plink