Fossil SCM
Detect user@host in defined ssh-command and prefer that instead.
Commit
7a10b79a2ca8edd9eee1c14f30ee5cb5796bb90b
Parent
c38ff36ddf9c0ad…
1 file changed
+4
-2
+4
-2
| --- src/http_transport.c | ||
| +++ src/http_transport.c | ||
| @@ -146,12 +146,14 @@ | ||
| 146 | 146 | #endif |
| 147 | 147 | }else{ |
| 148 | 148 | zHost = mprintf("%s", g.urlName); |
| 149 | 149 | } |
| 150 | 150 | n = blob_size(&zCmd); |
| 151 | - blob_append(&zCmd, " ", 1); | |
| 152 | - shell_escape(&zCmd, zHost); | |
| 151 | + if( strchr(zSsh,'@')==0 ){ | |
| 152 | + blob_append(&zCmd, " ", 1); | |
| 153 | + shell_escape(&zCmd, zHost); | |
| 154 | + } | |
| 153 | 155 | if( g.fSshFossilCmd && g.fSshFossilCmd[0] ){ |
| 154 | 156 | blob_append(&zCmd, " ", 1); |
| 155 | 157 | shell_escape(&zCmd, mprintf("%s", g.fSshFossilCmd)); |
| 156 | 158 | }else{ |
| 157 | 159 | blob_append(&zCmd, " fossil", 7); |
| 158 | 160 |
| --- src/http_transport.c | |
| +++ src/http_transport.c | |
| @@ -146,12 +146,14 @@ | |
| 146 | #endif |
| 147 | }else{ |
| 148 | zHost = mprintf("%s", g.urlName); |
| 149 | } |
| 150 | n = blob_size(&zCmd); |
| 151 | blob_append(&zCmd, " ", 1); |
| 152 | shell_escape(&zCmd, zHost); |
| 153 | if( g.fSshFossilCmd && g.fSshFossilCmd[0] ){ |
| 154 | blob_append(&zCmd, " ", 1); |
| 155 | shell_escape(&zCmd, mprintf("%s", g.fSshFossilCmd)); |
| 156 | }else{ |
| 157 | blob_append(&zCmd, " fossil", 7); |
| 158 |
| --- src/http_transport.c | |
| +++ src/http_transport.c | |
| @@ -146,12 +146,14 @@ | |
| 146 | #endif |
| 147 | }else{ |
| 148 | zHost = mprintf("%s", g.urlName); |
| 149 | } |
| 150 | n = blob_size(&zCmd); |
| 151 | if( strchr(zSsh,'@')==0 ){ |
| 152 | blob_append(&zCmd, " ", 1); |
| 153 | shell_escape(&zCmd, zHost); |
| 154 | } |
| 155 | if( g.fSshFossilCmd && g.fSshFossilCmd[0] ){ |
| 156 | blob_append(&zCmd, " ", 1); |
| 157 | shell_escape(&zCmd, mprintf("%s", g.fSshFossilCmd)); |
| 158 | }else{ |
| 159 | blob_append(&zCmd, " fossil", 7); |
| 160 |