undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sf/putty-w-args'

Browse Source 
* sf/putty-w-args:
  connect.c: handle errors from split_cmdline
This commit is contained in:
Junio C Hamano 2017-04-19 21:37:24 -07:00
commit c96e3ce625
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
connect.c
View File

@ -730,7 +730,7 @@ static void handle_ssh_variant(const char *ssh_command, int is_cmdline,
const char **ssh_argv; const char **ssh_argv;
p = xstrdup(ssh_command); p = xstrdup(ssh_command);
if (split_cmdline(p, &ssh_argv)) { if (split_cmdline(p, &ssh_argv) > 0) {
variant = basename((char *)ssh_argv[0]); variant = basename((char *)ssh_argv[0]);
/* /*
* At this point, variant points into the buffer * At this point, variant points into the buffer

6
t/t5601-clone.sh
View File

@ -427,6 +427,12 @@ test_expect_success 'GIT_SSH_VARIANT overrides plink to tortoiseplink' '
expect_ssh "-batch -P 123" myhost src expect_ssh "-batch -P 123" myhost src
' '
test_expect_success 'clean failure on broken quoting' '
test_must_fail \
env GIT_SSH_COMMAND="${SQ}plink.exe -v" \
git clone "[myhost:123]:src" sq-failure
'
# Reset the GIT_SSH environment variable for clone tests. # Reset the GIT_SSH environment variable for clone tests.
setup_ssh_wrapper setup_ssh_wrapper