mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
Merge branch 'nd/connect-ssh-command-config'
A new configuration variable core.sshCommand has been added to specify what value for GIT_SSH_COMMAND to use per repository. * nd/connect-ssh-command-config: connect: read $GIT_SSH_COMMAND from config file
This commit is contained in:
commit
dc21164e66
|
@ -450,6 +450,13 @@ specify that no proxy be used for a given domain pattern.
|
|||
This is useful for excluding servers inside a firewall from
|
||||
proxy use, while defaulting to a common proxy for external domains.
|
||||
|
||||
core.sshCommand::
|
||||
If this variable is set, `git fetch` and `git push` will
|
||||
use the specified command instead of `ssh` when they need to
|
||||
connect to a remote system. The command is in the same form as
|
||||
the `GIT_SSH_COMMAND` environment variable and is overridden
|
||||
when the environment variable is set.
|
||||
|
||||
core.ignoreStat::
|
||||
If true, Git will avoid using lstat() calls to detect if files have
|
||||
changed by setting the "assume-unchanged" bit for those tracked files
|
||||
|
|
15
connect.c
15
connect.c
|
@ -658,6 +658,19 @@ static enum protocol parse_connect_url(const char *url_orig, char **ret_host,
|
|||
|
||||
static struct child_process no_fork = CHILD_PROCESS_INIT;
|
||||
|
||||
static const char *get_ssh_command(void)
|
||||
{
|
||||
const char *ssh;
|
||||
|
||||
if ((ssh = getenv("GIT_SSH_COMMAND")))
|
||||
return ssh;
|
||||
|
||||
if (!git_config_get_string_const("core.sshcommand", &ssh))
|
||||
return ssh;
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
* This returns a dummy child_process if the transport protocol does not
|
||||
* need fork(2), or a struct child_process object if it does. Once done,
|
||||
|
@ -758,7 +771,7 @@ struct child_process *git_connect(int fd[2], const char *url,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
ssh = getenv("GIT_SSH_COMMAND");
|
||||
ssh = get_ssh_command();
|
||||
if (!ssh) {
|
||||
const char *base;
|
||||
char *ssh_dup;
|
||||
|
|
Loading…
Reference in a new issue