lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lfsapi: refactor GIT_SSH_COMMAND processing into a function

Browse Source 
In a future commit, we're going to want to handle processing SSH-related
shell commands, so refactor the GIT_SSH_COMMAND processing into a
function for reuse.

This commit should result in no functional change.
This commit is contained in:
brian m. carlson 2018-09-07 15:21:22 +00:00
parent fcefe6890d
commit e19f951bff
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lfsapi/ssh.go
View File

@ -133,6 +133,19 @@ func sshGetLFSExeAndArgs(osEnv config.Environment, gitEnv config.Environment, e
return exe, args
}
// Parse command, and if it looks like a valid command, return the ssh binary
// name, the command to run, and whether we need a shell. If not, return
// existing as the ssh binary name.
func sshParseShellCommand(command string, existing string) (ssh string, cmd string, needShell bool) {
ssh = existing
if cmdArgs := tools.QuotedFields(command); len(cmdArgs) > 0 {
needShell = true
ssh = cmdArgs[0]
cmd = command
}
return
}
// Return the executable name for ssh on this machine and the base args
// Base args includes port settings, user/host, everything pre the command to execute
func sshGetExeAndArgs(osEnv config.Environment, gitEnv config.Environment, e Endpoint) (exe string, baseargs []string, needShell bool) {
@ -143,12 +156,7 @@ func sshGetExeAndArgs(osEnv config.Environment, gitEnv config.Environment, e End
ssh, _ := osEnv.Get("GIT_SSH")
sshCmd, _ := osEnv.Get("GIT_SSH_COMMAND")
cmdArgs := tools.QuotedFields(sshCmd)
if len(cmdArgs) > 0 {
needShell = true
ssh = cmdArgs[0]
cmd = sshCmd
}
ssh, cmd, needShell = sshParseShellCommand(sshCmd, ssh)
if ssh == "" {
ssh = defaultSSHCmd