From: Junio C Hamano Date: Wed, 6 Dec 2017 17:23:45 +0000 (-0800) Subject: Merge branch 'jn/ssh-wrappers' X-Git-Tag: v2.16.0-rc0~68 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ef470364448b6d5de159c3a961c1b1e8283d1dbc?ds=inline;hp=-c Merge branch 'jn/ssh-wrappers' The ssh-variant 'simple' introduced earlier broke existing installations by not passing --port/-4/-6 and not diagnosing an attempt to pass these as an error. Instead, default to automatically detect how compatible the GIT_SSH/GIT_SSH_COMMAND is to OpenSSH convention and then error out an invocation to make it easier to diagnose connection errors. * jn/ssh-wrappers: connect: correct style of C-style comment ssh: 'simple' variant does not support --port ssh: 'simple' variant does not support -4/-6 ssh: 'auto' variant to select between 'ssh' and 'simple' connect: split ssh option computation to its own function connect: split ssh command line options into separate function connect: split git:// setup into a separate function connect: move no_fork fallback to git_tcp_connect ssh test: make copy_ssh_wrapper_as clean up after itself --- ef470364448b6d5de159c3a961c1b1e8283d1dbc diff --combined Documentation/config.txt index 64bdce8435,0c371ad786..c1598ee703 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@@ -351,9 -351,6 +351,9 @@@ advice.*: addEmbeddedRepo:: Advice on what to do when you've accidentally added one git repo inside of another. + ignoredHook:: + Advice shown if an hook is ignored because the hook is not + set as executable. -- core.fileMode:: @@@ -416,13 -413,6 +416,13 @@@ core.protectNTFS: 8.3 "short" names. Defaults to `true` on Windows, and `false` elsewhere. +core.fsmonitor:: + If set, the value of this variable is used as a command which + will identify all files that may have changed since the + requested date/time. This information is used to speed up git by + avoiding unnecessary processing of files that have not changed. + See the "fsmonitor-watchman" section of linkgit:githooks[5]. + core.trustctime:: If false, the ctime differences between the index and the working tree are ignored; useful when the inode change time @@@ -959,23 -949,6 +959,23 @@@ apply.whitespace: Tells 'git apply' how to handle whitespaces, in the same way as the `--whitespace` option. See linkgit:git-apply[1]. +blame.showRoot:: + Do not treat root commits as boundaries in linkgit:git-blame[1]. + This option defaults to false. + +blame.blankBoundary:: + Show blank commit object name for boundary commits in + linkgit:git-blame[1]. This option defaults to false. + +blame.showEmail:: + Show the author email instead of author name in linkgit:git-blame[1]. + This option defaults to false. + +blame.date:: + Specifies the format used to output dates in linkgit:git-blame[1]. + If unset the iso format is used. For supported values, + see the discussion of the `--date` option at linkgit:git-log[1]. + branch.autoSetupMerge:: Tells 'git branch' and 'git checkout' to set up new branches so that linkgit:git-pull[1] will appropriately merge from the @@@ -2108,16 -2081,22 +2108,22 @@@ matched against are those given directl visited as a result of a redirection do not participate in matching. ssh.variant:: - Depending on the value of the environment variables `GIT_SSH` or - `GIT_SSH_COMMAND`, or the config setting `core.sshCommand`, Git - auto-detects whether to adjust its command-line parameters for use - with ssh (OpenSSH), plink or tortoiseplink, as opposed to the default - (simple). - + - The config variable `ssh.variant` can be set to override this auto-detection; - valid values are `ssh`, `simple`, `plink`, `putty` or `tortoiseplink`. Any - other value will be treated as normal ssh. This setting can be overridden via - the environment variable `GIT_SSH_VARIANT`. + 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 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). + + + The config variable `ssh.variant` can be set to override this detection. + Valid values are `ssh` (to use OpenSSH options), `plink`, `putty`, + `tortoiseplink`, `simple` (no options except the host and remote command). + The default auto-detection can be explicitly requested using the value + `auto`. Any other value is treated as `ssh`. This setting can also be + overridden via the environment variable `GIT_SSH_VARIANT`. + The current command-line parameters used for each variant are as follows: @@@ -2684,35 -2663,6 +2690,35 @@@ push.gpgSign: override a value from a lower-priority config file. An explicit command-line flag always overrides this config option. +push.pushOption:: + When no `--push-option=