Re: [ANNOUNCE] Git v2.16.0-rc0

2018-06-15 Thread Jeff King
On Fri, Jun 15, 2018 at 01:13:21AM -0400, Jeff King wrote: > > The trouble is that GIT_SSH_VARIANT=simple is too... simple. You > > would like a variant that passes in [-p port] [-4] [-6] as well. We > > didn't implement that because we didn't have the attention of any > > wrapper writer who

Re: [ANNOUNCE] Git v2.16.0-rc0

2018-06-14 Thread Jeff King
On Thu, Jun 14, 2018 at 09:20:33PM -0700, Jonathan Nieder wrote: > What we've switched to is a versioned interface. By setting > GIT_SSH_VARIANT=simple, you are asking Git to promise to pass exactly > options. If Git has a new option it wants to pass (like the "-o > SendEnv" thing) but can

Re: [ANNOUNCE] Git v2.16.0-rc0

2018-06-14 Thread Jonathan Nieder
Hi, Jeff King wrote: > On Thu, Jun 14, 2018 at 11:55:22AM -0700, Jonathan Nieder wrote: >> Do you mean that it doesn't pass "-G" through, or that when using old >> versions of openssh that doesn't support "-G" the probing fails? > > It just doesn't pass "-G" through. Thanks. >> If the former,

Re: [ANNOUNCE] Git v2.16.0-rc0

2018-06-14 Thread Jeff King
On Thu, Jun 14, 2018 at 11:55:22AM -0700, Jonathan Nieder wrote: > > No, my wrapper _isn't_ simple. It passes most options to openssh, but > > just doesn't understand the "-G" probing. So if the default was > > openssh-like instead of "simple", then that would work fine without me > > setting

Re: [ANNOUNCE] Git v2.16.0-rc0

2018-06-14 Thread Jonathan Nieder
Hi, Sorry for the slow replies. I was out of office earlier and am back now. Jeff King wrote: > On Tue, Jun 12, 2018 at 09:29:13AM -0700, Junio C Hamano wrote: >> Jeff King writes: >>> To be honest, I could easily see an argument that I _should_ be setting >>> GIT_SSH_VARIANT to explain what

Re: [ANNOUNCE] Git v2.16.0-rc0

2018-06-14 Thread Jeff King
On Tue, Jun 12, 2018 at 09:29:13AM -0700, Junio C Hamano wrote: > Jeff King writes: > > > To be honest, I could easily see an argument that I _should_ be setting > > GIT_SSH_VARIANT to explain what my wrapper is expecting, even though it > > happened to work before. > > The way I read that

Re: [ANNOUNCE] Git v2.16.0-rc0

2018-06-12 Thread Junio C Hamano
Jeff King writes: > To be honest, I could easily see an argument that I _should_ be setting > GIT_SSH_VARIANT to explain what my wrapper is expecting, even though it > happened to work before. The way I read that message is that the patch proposed in

Re: [ANNOUNCE] Git v2.16.0-rc0

2018-06-07 Thread Jeff King
On Tue, Jan 02, 2018 at 09:35:16PM -0800, Jonathan Nieder 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]

Re: [ANNOUNCE] Git v2.16.0-rc0

2018-01-04 Thread Paul Smith
On Thu, 2018-01-04 at 20:18 +, Thomas Gummerer wrote: > On 12/29, Paul Smith wrote: > > On Thu, 2017-12-28 at 20:30 -0800, Junio C Hamano wrote: > > > * The way "git worktree add" determines what branch to create > > > from where and checkout in the new worktree has been updated a > > > bit.

Re: [ANNOUNCE] Git v2.16.0-rc0

2018-01-04 Thread Johannes Schindelin
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,

Re: [ANNOUNCE] Git v2.16.0-rc0

2018-01-04 Thread Thomas Gummerer
On 12/29, Paul Smith wrote: > On Thu, 2017-12-28 at 20:30 -0800, Junio C Hamano wrote: > > * The way "git worktree add" determines what branch to create from > >where and checkout in the new worktree has been updated a bit. > > Does this include the enhancements published a few weeks ago to

Re: [ANNOUNCE] Git v2.16.0-rc0

2018-01-03 Thread Junio C Hamano
Jonathan Nieder writes: > 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. So the idea is to keep the 'simple' for implementations that do not

Re: [ANNOUNCE] Git v2.16.0-rc0

2018-01-02 Thread Jonathan Nieder
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

Re: [ANNOUNCE] Git v2.16.0-rc0

2018-01-02 Thread Bryan Turner
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

Re: [ANNOUNCE] Git v2.16.0-rc0

2018-01-02 Thread Jonathan Nieder
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

Re: [ANNOUNCE] Git v2.16.0-rc0

2018-01-02 Thread Jonathan Nieder
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"

Re: [ANNOUNCE] Git v2.16.0-rc0

2018-01-02 Thread Bryan Turner
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

Re: [ANNOUNCE] Git v2.16.0-rc0

2017-12-29 Thread Paul Smith
On Thu, 2017-12-28 at 20:30 -0800, Junio C Hamano wrote: > * The way "git worktree add" determines what branch to create from >where and checkout in the new worktree has been updated a bit. Does this include the enhancements published a few weeks ago to allow worktrees to be created directly

Re: [ANNOUNCE] Git v2.16.0-rc0

2017-12-28 Thread Kaartic Sivaraam
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