Re: [ANNOUNCE] Git v2.16.0-rc0
Hi, On Thu, 28 Dec 2017, Junio C Hamano wrote: > An early preview release Git v2.16.0-rc0 is now available for > testing at the usual places. And a corresponding Git for Windows prerelease is also available: https://github.com/git-for-windows/git/releases/tag/v2.16.0-rc0.windows.1 Ciao, Johannes
Re: [ANNOUNCE] Git v2.16.0-rc0
Hi, On Thu, 28 Dec 2017, Junio C Hamano wrote: > An early preview release Git v2.16.0-rc0 is now available for > testing at the usual places. And a corresponding Git for Windows prerelease is also available: https://github.com/git-for-windows/git/releases/tag/v2.16.0-rc0.windows.1 Ciao, Johannes
Re: [ANNOUNCE] Git v2.16.0-rc0
Bryan Turner wrote: > On Tue, Jan 2, 2018 at 9:07 PM, Jonathan Niederwrote: >> So my first question is why the basename detection is not working for >> you. What value of GIT_SSH, GIT_SSH_COMMAND, or core.sshCommand are >> you using? > > So I'd been digging further into this for the last hour because I > wasn't seeing quite the behavior I was expecting when I ran Git from > the command line on Ubuntu 12.04 or 14.04, and this nudged me to the > right answer: We're setting GIT_SSH to a wrapper script. In our case, > that wrapper script is just calling OpenSSH's ssh with all the > provided arguments (plus a couple extra ones), but because we're > setting GIT_SSH at all, that's why the auto variant code is running. > That being the case, explicitly setting GIT_SSH_VARIANT=ssh may be the > correct thing to do, to tell Git that we want to be treated like > "normal" OpenSSH, as opposed to expecting Git to assume we behave like > OpenSSH (when the Android repo use case clearly shows that assumption > also doesn't hold). Ah, that's a comfort. Setting GIT_SSH_VARIANT would avoid this autodetection code and is the recommended thing to do. That said, we can't go back in time and update everyone's tools to do that (e.g. there is not even a release of repo with [1] out yet), so this is still considered a regression and I'm glad you found it. Jonathan [1] https://gerrit-review.googlesource.com/c/git-repo/+/134950
Re: [ANNOUNCE] Git v2.16.0-rc0
Bryan Turner wrote: > On Tue, Jan 2, 2018 at 9:07 PM, Jonathan Nieder wrote: >> So my first question is why the basename detection is not working for >> you. What value of GIT_SSH, GIT_SSH_COMMAND, or core.sshCommand are >> you using? > > So I'd been digging further into this for the last hour because I > wasn't seeing quite the behavior I was expecting when I ran Git from > the command line on Ubuntu 12.04 or 14.04, and this nudged me to the > right answer: We're setting GIT_SSH to a wrapper script. In our case, > that wrapper script is just calling OpenSSH's ssh with all the > provided arguments (plus a couple extra ones), but because we're > setting GIT_SSH at all, that's why the auto variant code is running. > That being the case, explicitly setting GIT_SSH_VARIANT=ssh may be the > correct thing to do, to tell Git that we want to be treated like > "normal" OpenSSH, as opposed to expecting Git to assume we behave like > OpenSSH (when the Android repo use case clearly shows that assumption > also doesn't hold). Ah, that's a comfort. Setting GIT_SSH_VARIANT would avoid this autodetection code and is the recommended thing to do. That said, we can't go back in time and update everyone's tools to do that (e.g. there is not even a release of repo with [1] out yet), so this is still considered a regression and I'm glad you found it. Jonathan [1] https://gerrit-review.googlesource.com/c/git-repo/+/134950
Re: [ANNOUNCE] Git v2.16.0-rc0
On Tue, Jan 2, 2018 at 9:07 PM, Jonathan Niederwrote: > Hi Bryan, > > Bryan Turner wrote: > >> Our test environment is still on Ubuntu 12.04 LTS (it's a long story, >> but one I doubt is unique to us), which means it's using OpenSSH 5.9. >> ssh -G was added in OpenSSH 6.8 [1], circa March 2015, which means the >> "auto" detection "fails" and chooses "simple" instead of "ssh". But >> OpenSSH 5.9 _does_ support -4, -6 and -p. As a result, commands which >> have been working without issue on all previous versions of Git start >> to fail saying >> >> git -c gc.auto=0 -c credential.helper= fetch --force --prune --progress >> ssh://localhost:64281/repo.git +refs/*:refs/*' exited with code 128 saying: >> fatal: ssh variant 'simple' does not support setting port > > Hm, that's not expected. git-config(1) says: > > By default, Git determines the command line arguments to use > based on the basename of the configured SSH command > (configured using the environment variable GIT_SSH or > GIT_SSH_COMMAND or the config setting core.sshCommand). If the > basename is unrecognized, Git will attempt to detect support > of OpenSSH options by [...] > > So my first question is why the basename detection is not working for > you. What value of GIT_SSH, GIT_SSH_COMMAND, or core.sshCommand are > you using? So I'd been digging further into this for the last hour because I wasn't seeing quite the behavior I was expecting when I ran Git from the command line on Ubuntu 12.04 or 14.04, and this nudged me to the right answer: We're setting GIT_SSH to a wrapper script. In our case, that wrapper script is just calling OpenSSH's ssh with all the provided arguments (plus a couple extra ones), but because we're setting GIT_SSH at all, that's why the auto variant code is running. That being the case, explicitly setting GIT_SSH_VARIANT=ssh may be the correct thing to do, to tell Git that we want to be treated like "normal" OpenSSH, as opposed to expecting Git to assume we behave like OpenSSH (when the Android repo use case clearly shows that assumption also doesn't hold). Based on that, I'm not sure if you _actually_ need to change anything, and I apologize for not turning up that we were setting GIT_SSH before I bothered you. Thanks immensely for looking into it, Jonathan, and my apologies again for wasting your time! Bryan Turner
Re: [ANNOUNCE] Git v2.16.0-rc0
On Tue, Jan 2, 2018 at 9:07 PM, Jonathan Nieder wrote: > Hi Bryan, > > Bryan Turner wrote: > >> Our test environment is still on Ubuntu 12.04 LTS (it's a long story, >> but one I doubt is unique to us), which means it's using OpenSSH 5.9. >> ssh -G was added in OpenSSH 6.8 [1], circa March 2015, which means the >> "auto" detection "fails" and chooses "simple" instead of "ssh". But >> OpenSSH 5.9 _does_ support -4, -6 and -p. As a result, commands which >> have been working without issue on all previous versions of Git start >> to fail saying >> >> git -c gc.auto=0 -c credential.helper= fetch --force --prune --progress >> ssh://localhost:64281/repo.git +refs/*:refs/*' exited with code 128 saying: >> fatal: ssh variant 'simple' does not support setting port > > Hm, that's not expected. git-config(1) says: > > By default, Git determines the command line arguments to use > based on the basename of the configured SSH command > (configured using the environment variable GIT_SSH or > GIT_SSH_COMMAND or the config setting core.sshCommand). If the > basename is unrecognized, Git will attempt to detect support > of OpenSSH options by [...] > > So my first question is why the basename detection is not working for > you. What value of GIT_SSH, GIT_SSH_COMMAND, or core.sshCommand are > you using? So I'd been digging further into this for the last hour because I wasn't seeing quite the behavior I was expecting when I ran Git from the command line on Ubuntu 12.04 or 14.04, and this nudged me to the right answer: We're setting GIT_SSH to a wrapper script. In our case, that wrapper script is just calling OpenSSH's ssh with all the provided arguments (plus a couple extra ones), but because we're setting GIT_SSH at all, that's why the auto variant code is running. That being the case, explicitly setting GIT_SSH_VARIANT=ssh may be the correct thing to do, to tell Git that we want to be treated like "normal" OpenSSH, as opposed to expecting Git to assume we behave like OpenSSH (when the Android repo use case clearly shows that assumption also doesn't hold). Based on that, I'm not sure if you _actually_ need to change anything, and I apologize for not turning up that we were setting GIT_SSH before I bothered you. Thanks immensely for looking into it, Jonathan, and my apologies again for wasting your time! Bryan Turner
Re: [ANNOUNCE] Git v2.16.0-rc0
Hi, A few more notes. Bryan Turner wrote: > bturner@ubuntu:~$ ssh -V > OpenSSH_6.6.1p1 Ubuntu-2ubuntu2.8, OpenSSL 1.0.1f 6 Jan 2014 > > bturner@ubuntu:~$ ssh -G -p 7999 localhost > unknown option -- G > usage: ssh [-1246AaCfgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec] [...] > Is it possible to adjust the check, somehow, so it doesn't impact > older OpenSSH versions like this? As it stands, it seems likely a fair > number of users who have an SSH command that does support -4, -6 and > -p are going to end up getting "penalized" because it doesn't also > support -G, and have to manually set their SSH variant to "ssh" (or > something other than "auto") to avoid the automatic detection. > > I'd love to say I have a brilliant idea for how to work around this, > oh and here's a patch, but I don't. One option might be trying to > actually review the output, and another might be to run "ssh -V", but > both of those have their own flaws (and the extra process forks aren't > "free"). I have tomorrow off, so I've filed https://crbug.com/git/7 to make sure I remember to follow up the day after. Of course I'll be happy if someone updates that bug saying they've fixed it in the meantime. One possibility would be to use -V as a fallback when -G fails, or even as a replacement for this usage of -G. To avoid misdetecting PuTTY and other ssh variants that also implement -V as OpenSSH, we would have to parse the output. This would also misdetect a script that does host=$1; shift ssh "$host" -- "$@" as supporting OpenSSH options, when the use of -- ensures it doesn't. Another possibility is to parse the output when -G fails. That's hacky, but I think it would work well! We would not have to be too clever, since we can look for the exact output produced by the versions of OpenSSH that we care about. This still has issues with scripts that forward arguments to OpenSSH, but at least those issues would go away once the user updates their copy of ssh. ;-) Another possibility is to pass options *before* -V: ssh -p 7999 -V Since OpenSSH parses its arguments left-to-right, this gives similar information to what we did with -G, and scripts like host=$1; shift ssh "$host" -- "$@" would even be correctly detected as not supporting OpenSSH options. We still would need to parse the output to distinguish OpenSSH from other ssh implementations like putty (unlike OpenSSH, putty saves up argument errors in an 'error' variable and forgets about them once it sees -V). Trying -G and falling back to -V seems like the simplest detection mechanism to me at the moment. I'm hoping I'm missing something simple (another ssh option?) that allows avoiding this mess. Regardless, I think we should do something like [1] first to get rid of the regression. Thanks again for reporting it. Sincerely, Jonathan [1] https://public-inbox.org/git/20180103050730.ga87...@aiede.mtv.corp.google.com/
Re: [ANNOUNCE] Git v2.16.0-rc0
Hi, A few more notes. Bryan Turner wrote: > bturner@ubuntu:~$ ssh -V > OpenSSH_6.6.1p1 Ubuntu-2ubuntu2.8, OpenSSL 1.0.1f 6 Jan 2014 > > bturner@ubuntu:~$ ssh -G -p 7999 localhost > unknown option -- G > usage: ssh [-1246AaCfgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec] [...] > Is it possible to adjust the check, somehow, so it doesn't impact > older OpenSSH versions like this? As it stands, it seems likely a fair > number of users who have an SSH command that does support -4, -6 and > -p are going to end up getting "penalized" because it doesn't also > support -G, and have to manually set their SSH variant to "ssh" (or > something other than "auto") to avoid the automatic detection. > > I'd love to say I have a brilliant idea for how to work around this, > oh and here's a patch, but I don't. One option might be trying to > actually review the output, and another might be to run "ssh -V", but > both of those have their own flaws (and the extra process forks aren't > "free"). I have tomorrow off, so I've filed https://crbug.com/git/7 to make sure I remember to follow up the day after. Of course I'll be happy if someone updates that bug saying they've fixed it in the meantime. One possibility would be to use -V as a fallback when -G fails, or even as a replacement for this usage of -G. To avoid misdetecting PuTTY and other ssh variants that also implement -V as OpenSSH, we would have to parse the output. This would also misdetect a script that does host=$1; shift ssh "$host" -- "$@" as supporting OpenSSH options, when the use of -- ensures it doesn't. Another possibility is to parse the output when -G fails. That's hacky, but I think it would work well! We would not have to be too clever, since we can look for the exact output produced by the versions of OpenSSH that we care about. This still has issues with scripts that forward arguments to OpenSSH, but at least those issues would go away once the user updates their copy of ssh. ;-) Another possibility is to pass options *before* -V: ssh -p 7999 -V Since OpenSSH parses its arguments left-to-right, this gives similar information to what we did with -G, and scripts like host=$1; shift ssh "$host" -- "$@" would even be correctly detected as not supporting OpenSSH options. We still would need to parse the output to distinguish OpenSSH from other ssh implementations like putty (unlike OpenSSH, putty saves up argument errors in an 'error' variable and forgets about them once it sees -V). Trying -G and falling back to -V seems like the simplest detection mechanism to me at the moment. I'm hoping I'm missing something simple (another ssh option?) that allows avoiding this mess. Regardless, I think we should do something like [1] first to get rid of the regression. Thanks again for reporting it. Sincerely, Jonathan [1] https://public-inbox.org/git/20180103050730.ga87...@aiede.mtv.corp.google.com/
Re: [ANNOUNCE] Git v2.16.0-rc0
Hi Bryan, Bryan Turner wrote: > Our test environment is still on Ubuntu 12.04 LTS (it's a long story, > but one I doubt is unique to us), which means it's using OpenSSH 5.9. > ssh -G was added in OpenSSH 6.8 [1], circa March 2015, which means the > "auto" detection "fails" and chooses "simple" instead of "ssh". But > OpenSSH 5.9 _does_ support -4, -6 and -p. As a result, commands which > have been working without issue on all previous versions of Git start > to fail saying > > git -c gc.auto=0 -c credential.helper= fetch --force --prune --progress > ssh://localhost:64281/repo.git +refs/*:refs/*' exited with code 128 saying: > fatal: ssh variant 'simple' does not support setting port Hm, that's not expected. git-config(1) says: By default, Git determines the command line arguments to use based on the basename of the configured SSH command (configured using the environment variable GIT_SSH or GIT_SSH_COMMAND or the config setting core.sshCommand). If the basename is unrecognized, Git will attempt to detect support of OpenSSH options by [...] So my first question is why the basename detection is not working for you. What value of GIT_SSH, GIT_SSH_COMMAND, or core.sshCommand are you using? > I know Ubuntu 12.04 LTS is end-of-life, but 14.04 LTS, which is > running OpenSSH 6.6 [2], has the same issue. The following is from a > fully patched 14.04.5: > > bturner@ubuntu:~$ cat /etc/*ease | head -4 > DISTRIB_ID=Ubuntu > DISTRIB_RELEASE=14.04 > DISTRIB_CODENAME=trusty > DISTRIB_DESCRIPTION="Ubuntu 14.04.5 LTS" > > bturner@ubuntu:~$ ssh -V > OpenSSH_6.6.1p1 Ubuntu-2ubuntu2.8, OpenSSL 1.0.1f 6 Jan 2014 > > bturner@ubuntu:~$ ssh -G -p 7999 localhost > unknown option -- G It's good you caught this flaw in the detection. Would something like the following make sense? If so, I can resend with a commit message and tests tomorrow or the day after. diff --git i/Documentation/config.txt w/Documentation/config.txt index 64c1dbba94..75eafd8db6 100644 --- i/Documentation/config.txt +++ w/Documentation/config.txt @@ -2118,8 +2118,8 @@ ssh.variant:: unrecognized, Git will attempt to detect support of OpenSSH options by first invoking the configured SSH command with the `-G` (print configuration) option and will subsequently use - OpenSSH options (if that is successful) or no options besides - the host and remote command (if it fails). + OpenSSH options if that is successful or a conservative set of + OpenSSH-style options if it fails. + The config variable `ssh.variant` can be set to override this detection. Valid values are `ssh` (to use OpenSSH options), `plink`, `putty`, diff --git i/connect.c w/connect.c index c3a014c5ba..3784c2be53 100644 --- i/connect.c +++ w/connect.c @@ -941,10 +941,9 @@ static void push_ssh_options(struct argv_array *args, struct argv_array *env, if (flags & CONNECT_IPV4) { switch (variant) { - case VARIANT_AUTO: - BUG("VARIANT_AUTO passed to push_ssh_options"); case VARIANT_SIMPLE: die("ssh variant 'simple' does not support -4"); + case VARIANT_AUTO: case VARIANT_SSH: case VARIANT_PLINK: case VARIANT_PUTTY: @@ -953,10 +952,9 @@ static void push_ssh_options(struct argv_array *args, struct argv_array *env, } } else if (flags & CONNECT_IPV6) { switch (variant) { - case VARIANT_AUTO: - BUG("VARIANT_AUTO passed to push_ssh_options"); case VARIANT_SIMPLE: die("ssh variant 'simple' does not support -6"); + case VARIANT_AUTO: case VARIANT_SSH: case VARIANT_PLINK: case VARIANT_PUTTY: @@ -970,10 +968,9 @@ static void push_ssh_options(struct argv_array *args, struct argv_array *env, if (port) { switch (variant) { - case VARIANT_AUTO: - BUG("VARIANT_AUTO passed to push_ssh_options"); case VARIANT_SIMPLE: die("ssh variant 'simple' does not support setting port"); + case VARIANT_AUTO: case VARIANT_SSH: argv_array_push(args, "-p"); break; @@ -1026,7 +1023,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host, VARIANT_SSH, port, flags); argv_array_push(, ssh_host); - variant = run_command() ? VARIANT_SIMPLE : VARIANT_SSH; + variant = run_command() ? VARIANT_AUTO : VARIANT_SSH; } argv_array_push(>args, ssh); diff --git i/t/t5601-clone.sh w/t/t5601-clone.sh index 0f895478f0..0224edc85b 100755 --- i/t/t5601-clone.sh +++ w/t/t5601-clone.sh @@ -365,6 +365,11 @@
Re: [ANNOUNCE] Git v2.16.0-rc0
Hi Bryan, Bryan Turner wrote: > Our test environment is still on Ubuntu 12.04 LTS (it's a long story, > but one I doubt is unique to us), which means it's using OpenSSH 5.9. > ssh -G was added in OpenSSH 6.8 [1], circa March 2015, which means the > "auto" detection "fails" and chooses "simple" instead of "ssh". But > OpenSSH 5.9 _does_ support -4, -6 and -p. As a result, commands which > have been working without issue on all previous versions of Git start > to fail saying > > git -c gc.auto=0 -c credential.helper= fetch --force --prune --progress > ssh://localhost:64281/repo.git +refs/*:refs/*' exited with code 128 saying: > fatal: ssh variant 'simple' does not support setting port Hm, that's not expected. git-config(1) says: By default, Git determines the command line arguments to use based on the basename of the configured SSH command (configured using the environment variable GIT_SSH or GIT_SSH_COMMAND or the config setting core.sshCommand). If the basename is unrecognized, Git will attempt to detect support of OpenSSH options by [...] So my first question is why the basename detection is not working for you. What value of GIT_SSH, GIT_SSH_COMMAND, or core.sshCommand are you using? > I know Ubuntu 12.04 LTS is end-of-life, but 14.04 LTS, which is > running OpenSSH 6.6 [2], has the same issue. The following is from a > fully patched 14.04.5: > > bturner@ubuntu:~$ cat /etc/*ease | head -4 > DISTRIB_ID=Ubuntu > DISTRIB_RELEASE=14.04 > DISTRIB_CODENAME=trusty > DISTRIB_DESCRIPTION="Ubuntu 14.04.5 LTS" > > bturner@ubuntu:~$ ssh -V > OpenSSH_6.6.1p1 Ubuntu-2ubuntu2.8, OpenSSL 1.0.1f 6 Jan 2014 > > bturner@ubuntu:~$ ssh -G -p 7999 localhost > unknown option -- G It's good you caught this flaw in the detection. Would something like the following make sense? If so, I can resend with a commit message and tests tomorrow or the day after. diff --git i/Documentation/config.txt w/Documentation/config.txt index 64c1dbba94..75eafd8db6 100644 --- i/Documentation/config.txt +++ w/Documentation/config.txt @@ -2118,8 +2118,8 @@ ssh.variant:: unrecognized, Git will attempt to detect support of OpenSSH options by first invoking the configured SSH command with the `-G` (print configuration) option and will subsequently use - OpenSSH options (if that is successful) or no options besides - the host and remote command (if it fails). + OpenSSH options if that is successful or a conservative set of + OpenSSH-style options if it fails. + The config variable `ssh.variant` can be set to override this detection. Valid values are `ssh` (to use OpenSSH options), `plink`, `putty`, diff --git i/connect.c w/connect.c index c3a014c5ba..3784c2be53 100644 --- i/connect.c +++ w/connect.c @@ -941,10 +941,9 @@ static void push_ssh_options(struct argv_array *args, struct argv_array *env, if (flags & CONNECT_IPV4) { switch (variant) { - case VARIANT_AUTO: - BUG("VARIANT_AUTO passed to push_ssh_options"); case VARIANT_SIMPLE: die("ssh variant 'simple' does not support -4"); + case VARIANT_AUTO: case VARIANT_SSH: case VARIANT_PLINK: case VARIANT_PUTTY: @@ -953,10 +952,9 @@ static void push_ssh_options(struct argv_array *args, struct argv_array *env, } } else if (flags & CONNECT_IPV6) { switch (variant) { - case VARIANT_AUTO: - BUG("VARIANT_AUTO passed to push_ssh_options"); case VARIANT_SIMPLE: die("ssh variant 'simple' does not support -6"); + case VARIANT_AUTO: case VARIANT_SSH: case VARIANT_PLINK: case VARIANT_PUTTY: @@ -970,10 +968,9 @@ static void push_ssh_options(struct argv_array *args, struct argv_array *env, if (port) { switch (variant) { - case VARIANT_AUTO: - BUG("VARIANT_AUTO passed to push_ssh_options"); case VARIANT_SIMPLE: die("ssh variant 'simple' does not support setting port"); + case VARIANT_AUTO: case VARIANT_SSH: argv_array_push(args, "-p"); break; @@ -1026,7 +1023,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host, VARIANT_SSH, port, flags); argv_array_push(, ssh_host); - variant = run_command() ? VARIANT_SIMPLE : VARIANT_SSH; + variant = run_command() ? VARIANT_AUTO : VARIANT_SSH; } argv_array_push(>args, ssh); diff --git i/t/t5601-clone.sh w/t/t5601-clone.sh index 0f895478f0..0224edc85b 100755 --- i/t/t5601-clone.sh +++ w/t/t5601-clone.sh @@ -365,6 +365,11 @@
Re: [ANNOUNCE] Git v2.16.0-rc0
On Thu, Dec 28, 2017 at 8:30 PM, Junio C Hamanowrote: > An early preview release Git v2.16.0-rc0 is now available for > testing at the usual places. It is comprised of 435 non-merge > commits since v2.15.0, contributed by 76 people, 22 of which are > new faces. > Brandon Williams (24): > ssh: introduce a 'simple' ssh variant > Jonathan Nieder (10): > ssh test: make copy_ssh_wrapper_as clean up after itself > connect: move no_fork fallback to git_tcp_connect > connect: split git:// setup into a separate function > connect: split ssh command line options into separate function > connect: split ssh option computation to its own function > ssh: 'auto' variant to select between 'ssh' and 'simple' > ssh: 'simple' variant does not support -4/-6 > ssh: 'simple' variant does not support --port > connect: correct style of C-style comment > generate-cmdlist: avoid non-deterministic output Sorry for being late to the party on the "simple" variant for SSH, but we've been doing some testing with 2.16.0-rc0 and noticed an unexpected issue. Our test environment is still on Ubuntu 12.04 LTS (it's a long story, but one I doubt is unique to us), which means it's using OpenSSH 5.9. ssh -G was added in OpenSSH 6.8 [1], circa March 2015, which means the "auto" detection "fails" and chooses "simple" instead of "ssh". But OpenSSH 5.9 _does_ support -4, -6 and -p. As a result, commands which have been working without issue on all previous versions of Git start to fail saying: git -c gc.auto=0 -c credential.helper= fetch --force --prune --progress ssh://localhost:64281/repo.git +refs/*:refs/*' exited with code 128 saying: fatal: ssh variant 'simple' does not support setting port I know Ubuntu 12.04 LTS is end-of-life, but 14.04 LTS, which is running OpenSSH 6.6 [2], has the same issue. The following is from a fully patched 14.04.5: bturner@ubuntu:~$ cat /etc/*ease | head -4 DISTRIB_ID=Ubuntu DISTRIB_RELEASE=14.04 DISTRIB_CODENAME=trusty DISTRIB_DESCRIPTION="Ubuntu 14.04.5 LTS" bturner@ubuntu:~$ ssh -V OpenSSH_6.6.1p1 Ubuntu-2ubuntu2.8, OpenSSL 1.0.1f 6 Jan 2014 bturner@ubuntu:~$ ssh -G -p 7999 localhost unknown option -- G usage: ssh [-1246AaCfgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec] [-D [bind_address:]port] [-E log_file] [-e escape_char] [-F configfile] [-I pkcs11] [-i identity_file] [-L [bind_address:]port:host:hostport] [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port] [-Q cipher | cipher-auth | mac | kex | key] [-R [bind_address:]port:host:hostport] [-S ctl_path] [-W host:port] [-w local_tun[:remote_tun]] [user@]hostname [command] Is it possible to adjust the check, somehow, so it doesn't impact older OpenSSH versions like this? As it stands, it seems likely a fair number of users who have an SSH command that does support -4, -6 and -p are going to end up getting "penalized" because it doesn't also support -G, and have to manually set their SSH variant to "ssh" (or something other than "auto") to avoid the automatic detection. I'd love to say I have a brilliant idea for how to work around this, oh and here's a patch, but I don't. One option might be trying to actually review the output, and another might be to run "ssh -V", but both of those have their own flaws (and the extra process forks aren't "free"). [1] https://www.openssh.com/txt/release-6.8 [2] https://launchpad.net/ubuntu/+source/openssh Best regards, Bryan Turner
Re: [ANNOUNCE] Git v2.16.0-rc0
On Thu, Dec 28, 2017 at 8:30 PM, Junio C Hamano wrote: > An early preview release Git v2.16.0-rc0 is now available for > testing at the usual places. It is comprised of 435 non-merge > commits since v2.15.0, contributed by 76 people, 22 of which are > new faces. > Brandon Williams (24): > ssh: introduce a 'simple' ssh variant > Jonathan Nieder (10): > ssh test: make copy_ssh_wrapper_as clean up after itself > connect: move no_fork fallback to git_tcp_connect > connect: split git:// setup into a separate function > connect: split ssh command line options into separate function > connect: split ssh option computation to its own function > ssh: 'auto' variant to select between 'ssh' and 'simple' > ssh: 'simple' variant does not support -4/-6 > ssh: 'simple' variant does not support --port > connect: correct style of C-style comment > generate-cmdlist: avoid non-deterministic output Sorry for being late to the party on the "simple" variant for SSH, but we've been doing some testing with 2.16.0-rc0 and noticed an unexpected issue. Our test environment is still on Ubuntu 12.04 LTS (it's a long story, but one I doubt is unique to us), which means it's using OpenSSH 5.9. ssh -G was added in OpenSSH 6.8 [1], circa March 2015, which means the "auto" detection "fails" and chooses "simple" instead of "ssh". But OpenSSH 5.9 _does_ support -4, -6 and -p. As a result, commands which have been working without issue on all previous versions of Git start to fail saying: git -c gc.auto=0 -c credential.helper= fetch --force --prune --progress ssh://localhost:64281/repo.git +refs/*:refs/*' exited with code 128 saying: fatal: ssh variant 'simple' does not support setting port I know Ubuntu 12.04 LTS is end-of-life, but 14.04 LTS, which is running OpenSSH 6.6 [2], has the same issue. The following is from a fully patched 14.04.5: bturner@ubuntu:~$ cat /etc/*ease | head -4 DISTRIB_ID=Ubuntu DISTRIB_RELEASE=14.04 DISTRIB_CODENAME=trusty DISTRIB_DESCRIPTION="Ubuntu 14.04.5 LTS" bturner@ubuntu:~$ ssh -V OpenSSH_6.6.1p1 Ubuntu-2ubuntu2.8, OpenSSL 1.0.1f 6 Jan 2014 bturner@ubuntu:~$ ssh -G -p 7999 localhost unknown option -- G usage: ssh [-1246AaCfgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec] [-D [bind_address:]port] [-E log_file] [-e escape_char] [-F configfile] [-I pkcs11] [-i identity_file] [-L [bind_address:]port:host:hostport] [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port] [-Q cipher | cipher-auth | mac | kex | key] [-R [bind_address:]port:host:hostport] [-S ctl_path] [-W host:port] [-w local_tun[:remote_tun]] [user@]hostname [command] Is it possible to adjust the check, somehow, so it doesn't impact older OpenSSH versions like this? As it stands, it seems likely a fair number of users who have an SSH command that does support -4, -6 and -p are going to end up getting "penalized" because it doesn't also support -G, and have to manually set their SSH variant to "ssh" (or something other than "auto") to avoid the automatic detection. I'd love to say I have a brilliant idea for how to work around this, oh and here's a patch, but I don't. One option might be trying to actually review the output, and another might be to run "ssh -V", but both of those have their own flaws (and the extra process forks aren't "free"). [1] https://www.openssh.com/txt/release-6.8 [2] https://launchpad.net/ubuntu/+source/openssh Best regards, Bryan Turner
Re: [ANNOUNCE] Git v2.16.0-rc0
On Friday 29 December 2017 10:00 AM, Junio C Hamano wrote: * "git branch" and "git checkout -b" are now forbidden from creating a branch whose name is "HEAD". "git branch" already forbid a branch named "HEAD", didn't it? I thought we just made "git checkout -b" to reject "HEAD" as a valid branch name, recently. -- Kaartic
Re: [ANNOUNCE] Git v2.16.0-rc0
On Friday 29 December 2017 10:00 AM, Junio C Hamano wrote: * "git branch" and "git checkout -b" are now forbidden from creating a branch whose name is "HEAD". "git branch" already forbid a branch named "HEAD", didn't it? I thought we just made "git checkout -b" to reject "HEAD" as a valid branch name, recently. -- Kaartic
[ANNOUNCE] Git v2.16.0-rc0
An early preview release Git v2.16.0-rc0 is now available for testing at the usual places. It is comprised of 435 non-merge commits since v2.15.0, contributed by 76 people, 22 of which are new faces. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/testing/ The following public repositories all have a copy of the 'v2.16.0-rc0' tag and the 'master' branch that the tag points at: url = https://kernel.googlesource.com/pub/scm/git/git url = git://repo.or.cz/alt-git.git url = https://github.com/gitster/git New contributors whose contributions weren't in v2.15.0 are as follows. Welcome to the Git development community! Albert Astals Cid, Antoine Beaupré, Damien Marié, Daniel Bensoussan, Florian Klink, Gennady Kupava, Guillaume Castagnino, Haaris Mehmood, Hans Jerry Illikainen, Ingo Ruhnke, Jakub Bereżański, Jean Carlo Machado, J Wyman, Kevin, Łukasz Stelmach, Marius Paliga, Olga Telezhnaya, Rafael Ascensão, Robert Abel, Robert P. J. Day, Shuyu Wei, and Wei Shuyu. Returning contributors who helped this release are as follows. Thanks for your continued support. Adam Dinwoodie, Ævar Arnfjörð Bjarmason, Alex Vandiver, Anders Kaseorg, Andrey Okoshkin, Ann T Ropea, Beat Bolli, Ben Peart, Brandon Williams, brian m. carlson, Carlos Martín Nieto, Charles Bailey, Christian Couder, Dennis Kaarsemaker, Derrick Stolee, Elijah Newren, Emily Xie, Eric Sunshine, Eric Wong, Heiko Voigt, Jacob Keller, Jameson Miller, Jean-Noel Avila, Jeff Hostetler, Jeff King, Johannes Schindelin, Jonathan Nieder, Jonathan Tan, Junio C Hamano, Kaartic Sivaraam, Kevin Daudt, Lars Schneider, Liam Beguin, Martin Ågren, Michael Haggerty, Nicolas Morey-Chaisemartin, Phil Hord, Phillip Wood, Pranit Bauva, Prathamesh Chavan, Ramsay Jones, Randall S. Becker, Rasmus Villemoes, René Scharfe, Simon Ruderich, Stefan Beller, Steffen Prohaska, Stephan Beyer, SZEDER Gábor, Thomas Braun, Thomas Gummerer, Todd Zullinger, Torsten Bögershausen, and W. Trevor King. Git 2.16 Release Notes (draft) == Backward compatibility notes and other notable changes. * Use of an empty string as a pathspec element that is used for 'everything matches' is now an error. Updates since v2.15 --- UI, Workflows & Features * An empty string as a pathspec element that means "everything" i.e. 'git add ""', is now illegal. We started this by first deprecating and warning a pathspec that has such an element in 2.11 (Nov 2016). * A hook script that is set unexecutable is simply ignored. Git notifies when such a file is ignored, unless the message is squelched via advice.ignoredHook configuration. * "git pull" has been taught to accept "--[no-]signoff" option and pass it down to "git merge". * The "--push-option=" option to "git push" now defaults to a list of strings configured via push.pushOption variable. * "gitweb" checks if a directory is searchable with Perl's "-x" operator, which can be enhanced by using "filetest 'access'" pragma, which now we do. * "git stash save" has been deprecated in favour of "git stash push". * The set of paths output from "git status --ignored" was tied closely with its "--untracked=" option, but now it can be controlled more flexibly. Most notably, a directory that is ignored because it is listed to be ignored in the ignore/exclude mechanism can be handled differently from a directory that ends up to be ignored only because all files in it are ignored. * The remote-helper for talking to MediaWiki has been updated to truncate an overlong pagename so that ".mw" suffix can still be added. * The remote-helper for talking to MediaWiki has been updated to work with mediawiki namespaces. * The "--format=..." option "git for-each-ref" takes learned to show the name of the 'remote' repository and the ref at the remote side that is affected for 'upstream' and 'push' via "%(push:remotename)" and friends. * Doc and message updates to teach users "bisect view" is a synonym for "bisect visualize". * "git bisect run" that did not specify any command to run used to go ahead and treated all commits to be tested as 'good'. This has been corrected by making the command error out. * The SubmittingPatches document has been converted to produce an HTML version via AsciiDoc/Asciidoctor. * We learned to talk to watchman to speed up "git status" and other operations that need to see which paths have been modified. * The "diff" family of commands learned to ignore differences in carriage return at the end of line. * Places that know about "sendemail.to", like documentation and shell completion (in contrib/) have been taught about "sendemail.tocmd", too. * "git add --renormalize ." is a new and safer way to record the fact that you are correcting the end-of-line
[ANNOUNCE] Git v2.16.0-rc0
An early preview release Git v2.16.0-rc0 is now available for testing at the usual places. It is comprised of 435 non-merge commits since v2.15.0, contributed by 76 people, 22 of which are new faces. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/testing/ The following public repositories all have a copy of the 'v2.16.0-rc0' tag and the 'master' branch that the tag points at: url = https://kernel.googlesource.com/pub/scm/git/git url = git://repo.or.cz/alt-git.git url = https://github.com/gitster/git New contributors whose contributions weren't in v2.15.0 are as follows. Welcome to the Git development community! Albert Astals Cid, Antoine Beaupré, Damien Marié, Daniel Bensoussan, Florian Klink, Gennady Kupava, Guillaume Castagnino, Haaris Mehmood, Hans Jerry Illikainen, Ingo Ruhnke, Jakub Bereżański, Jean Carlo Machado, J Wyman, Kevin, Łukasz Stelmach, Marius Paliga, Olga Telezhnaya, Rafael Ascensão, Robert Abel, Robert P. J. Day, Shuyu Wei, and Wei Shuyu. Returning contributors who helped this release are as follows. Thanks for your continued support. Adam Dinwoodie, Ævar Arnfjörð Bjarmason, Alex Vandiver, Anders Kaseorg, Andrey Okoshkin, Ann T Ropea, Beat Bolli, Ben Peart, Brandon Williams, brian m. carlson, Carlos Martín Nieto, Charles Bailey, Christian Couder, Dennis Kaarsemaker, Derrick Stolee, Elijah Newren, Emily Xie, Eric Sunshine, Eric Wong, Heiko Voigt, Jacob Keller, Jameson Miller, Jean-Noel Avila, Jeff Hostetler, Jeff King, Johannes Schindelin, Jonathan Nieder, Jonathan Tan, Junio C Hamano, Kaartic Sivaraam, Kevin Daudt, Lars Schneider, Liam Beguin, Martin Ågren, Michael Haggerty, Nicolas Morey-Chaisemartin, Phil Hord, Phillip Wood, Pranit Bauva, Prathamesh Chavan, Ramsay Jones, Randall S. Becker, Rasmus Villemoes, René Scharfe, Simon Ruderich, Stefan Beller, Steffen Prohaska, Stephan Beyer, SZEDER Gábor, Thomas Braun, Thomas Gummerer, Todd Zullinger, Torsten Bögershausen, and W. Trevor King. Git 2.16 Release Notes (draft) == Backward compatibility notes and other notable changes. * Use of an empty string as a pathspec element that is used for 'everything matches' is now an error. Updates since v2.15 --- UI, Workflows & Features * An empty string as a pathspec element that means "everything" i.e. 'git add ""', is now illegal. We started this by first deprecating and warning a pathspec that has such an element in 2.11 (Nov 2016). * A hook script that is set unexecutable is simply ignored. Git notifies when such a file is ignored, unless the message is squelched via advice.ignoredHook configuration. * "git pull" has been taught to accept "--[no-]signoff" option and pass it down to "git merge". * The "--push-option=" option to "git push" now defaults to a list of strings configured via push.pushOption variable. * "gitweb" checks if a directory is searchable with Perl's "-x" operator, which can be enhanced by using "filetest 'access'" pragma, which now we do. * "git stash save" has been deprecated in favour of "git stash push". * The set of paths output from "git status --ignored" was tied closely with its "--untracked=" option, but now it can be controlled more flexibly. Most notably, a directory that is ignored because it is listed to be ignored in the ignore/exclude mechanism can be handled differently from a directory that ends up to be ignored only because all files in it are ignored. * The remote-helper for talking to MediaWiki has been updated to truncate an overlong pagename so that ".mw" suffix can still be added. * The remote-helper for talking to MediaWiki has been updated to work with mediawiki namespaces. * The "--format=..." option "git for-each-ref" takes learned to show the name of the 'remote' repository and the ref at the remote side that is affected for 'upstream' and 'push' via "%(push:remotename)" and friends. * Doc and message updates to teach users "bisect view" is a synonym for "bisect visualize". * "git bisect run" that did not specify any command to run used to go ahead and treated all commits to be tested as 'good'. This has been corrected by making the command error out. * The SubmittingPatches document has been converted to produce an HTML version via AsciiDoc/Asciidoctor. * We learned to talk to watchman to speed up "git status" and other operations that need to see which paths have been modified. * The "diff" family of commands learned to ignore differences in carriage return at the end of line. * Places that know about "sendemail.to", like documentation and shell completion (in contrib/) have been taught about "sendemail.tocmd", too. * "git add --renormalize ." is a new and safer way to record the fact that you are correcting the end-of-line