Merge ~bartvdbraak/ubuntu/+source/git-lfs:ubuntu/noble-updates into ubuntu/+source/git-lfs:ubuntu/noble-updates

[Bart]

Backport fixes from upstream that resolve Git LFS over SSH hanging issues (Closes: #2131243)

Fixes https://bugs.launchpad.net/ubuntu/+source/git-lfs/+bug/2131243
Upstream report https://github.com/git-lfs/git-lfs/issues/6017

Includes 3 separate commits from the upstream 3.5.0 release:

- ssh: Specifically designate a master multiplex connection
- tq/transfer_test.go: enable and fix all tests
- tq/transfer: copy Id and Token

Unmerged commits

19a9bd2... by Bart van der Braak <email address hidden> on 2026-01-30

3.4.1-1ubuntu0.4 (patches unapplied)

diff --git a/debian/changelog b/debian/changelog
index 0841cfd..bc5669c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+git-lfs (3.4.1-1ubuntu0.4) noble; urgency=medium
+
+  * d/patches: Fix SSH push failures over multiplexed connections
+    (LP: #2131243)
+    - 0001-ssh-Specifically-designate-a-master-multiplex-connec.patch:
+      Properly designate master SSH multiplex connection and shutdown
+      sequence to prevent deadlock
+    - 0002-tq-transfer_test.go-enable-and-fix-all-tests.patch:
+      Enable and fix transfer adapter tests
+    - 0003-tq-transfer-copy-Id-and-Token.patch:
+      Copy Id and Token fields for SSH batch operations
+
+ -- Bart van der Braak <[e-mail]>  Thu, 30 Jan 2026 14:30:00 +0100
+
 git-lfs (3.4.1-1ubuntu0.3) noble-security; urgency=medium
 
   * No change rebuild due to golang-1.22 update
diff --git a/debian/patches/0001-ssh-Specifically-designate-a-master-multiplex-connec.patch b/debian/patches/0001-ssh-Specifically-designate-a-master-multiplex-connec.patch
new file mode 100644
index 0000000..6b385f8
--- /dev/null
+++ b/debian/patches/0001-ssh-Specifically-designate-a-master-multiplex-connec.patch
@@ -0,0 +1,641 @@
+From 87782e256a955d1e23f056d07be977a5f61fa203 Mon Sep 17 00:00:00 2001
+From: Kyle Edwards <[e-mail]>
+Date: Wed, 4 Oct 2023 10:55:15 -0400
+Subject: [PATCH 1/3] ssh: Specifically designate a master multiplex connection
+
+SSHTransfer.Shutdown() was attempting to first shut down the first
+connection it created (which happened to be the master connection),
+but this deadlocked because the master connection was waiting for
+the extra connections to shut down. Designate the first connection
+as the master connection, make sure that it truly is the master
+connection, and shut it down after shutting down all extra
+connections.
+
+Issue: #5535
+---
+ lfshttp/ssh.go        |   2 +-
+ ssh/connection.go     |  41 ++++++++++-----
+ ssh/ssh.go            |  45 ++++++++---------
+ ssh/ssh_test.go       | 115 +++++++++++++++++++++++++++++-------------
+ t/cmd/lfs-ssh-echo.go |  33 +++++++++++-
+ 5 files changed, 162 insertions(+), 74 deletions(-)
+
+diff --git a/lfshttp/ssh.go b/lfshttp/ssh.go
+index d69555ed..ec2cfbab 100644
+--- a/lfshttp/ssh.go
++++ b/lfshttp/ssh.go
+@@ -79,7 +79,7 @@ func (c *sshAuthClient) Resolve(e Endpoint, method string) (sshAuthResponse, err
+ 		return res, nil
+ 	}
+ 
+-	exe, args, _ := ssh.GetLFSExeAndArgs(c.os, c.git, &e.SSHMetadata, "git-lfs-authenticate", endpointOperation(e, method), false)
++	exe, args, _, _ := ssh.GetLFSExeAndArgs(c.os, c.git, &e.SSHMetadata, "git-lfs-authenticate", endpointOperation(e, method), false, "")
+ 	cmd, err := subprocess.ExecCommand(exe, args...)
+ 	if err != nil {
+ 		return res, err
+diff --git a/ssh/connection.go b/ssh/connection.go
+index 45018d1a..b078b3f7 100644
+--- a/ssh/connection.go
++++ b/ssh/connection.go
+@@ -17,10 +17,11 @@ type SSHTransfer struct {
+ 	meta         *SSHMetadata
+ 	operation    string
+ 	multiplexing bool
++	controlPath  string
+ }
+ 
+ func NewSSHTransfer(osEnv config.Environment, gitEnv config.Environment, meta *SSHMetadata, operation string) (*SSHTransfer, error) {
+-	conn, multiplexing, err := startConnection(0, osEnv, gitEnv, meta, operation)
++	conn, multiplexing, controlPath, err := startConnection(0, osEnv, gitEnv, meta, operation, "")
+ 	if err != nil {
+ 		return nil, err
+ 	}
+@@ -31,28 +32,29 @@ func NewSSHTransfer(osEnv config.Environment, gitEnv config.Environment, meta *S
+ 		meta:         meta,
+ 		operation:    operation,
+ 		multiplexing: multiplexing,
++		controlPath:  controlPath,
+ 		conn:         []*PktlineConnection{conn},
+ 	}, nil
+ }
+ 
+-func startConnection(id int, osEnv config.Environment, gitEnv config.Environment, meta *SSHMetadata, operation string) (*PktlineConnection, bool, error) {
++func startConnection(id int, osEnv config.Environment, gitEnv config.Environment, meta *SSHMetadata, operation string, multiplexControlPath string) (conn *PktlineConnection, multiplexing bool, controlPath string, err error) {
+ 	tracerx.Printf("spawning pure SSH connection")
+-	exe, args, multiplexing := GetLFSExeAndArgs(osEnv, gitEnv, meta, "git-lfs-transfer", operation, true)
++	exe, args, multiplexing, controlPath := GetLFSExeAndArgs(osEnv, gitEnv, meta, "git-lfs-transfer", operation, true, multiplexControlPath)
+ 	cmd, err := subprocess.ExecCommand(exe, args...)
+ 	if err != nil {
+-		return nil, false, err
++		return nil, false, "", err
+ 	}
+ 	r, err := cmd.StdoutPipe()
+ 	if err != nil {
+-		return nil, false, err
++		return nil, false, "", err
+ 	}
+ 	w, err := cmd.StdinPipe()
+ 	if err != nil {
+-		return nil, false, err
++		return nil, false, "", err
+ 	}
+ 	err = cmd.Start()
+ 	if err != nil {
+-		return nil, false, err
++		return nil, false, "", err
+ 	}
+ 
+ 	var pl Pktline
+@@ -61,7 +63,7 @@ func startConnection(id int, osEnv config.Environment, gitEnv config.Environment
+ 	} else {
+ 		pl = pktline.NewPktline(r, w)
+ 	}
+-	conn := &PktlineConnection{
++	conn = &PktlineConnection{
+ 		cmd: cmd,
+ 		pl:  pl,
+ 		r:   r,
+@@ -74,7 +76,7 @@ func startConnection(id int, osEnv config.Environment, gitEnv config.Environment
+ 		cmd.Wait()
+ 	}
+ 	tracerx.Printf("pure SSH connection successful")
+-	return conn, multiplexing, err
++	return conn, multiplexing, controlPath, err
+ }
+ 
+ // Connection returns the nth connection (starting from 0) in this transfer
+@@ -123,22 +125,37 @@ func (tr *SSHTransfer) SetConnectionCountAtLeast(n int) error {
+ func (tr *SSHTransfer) setConnectionCount(n int) error {
+ 	count := len(tr.conn)
+ 	if n < count {
+-		for _, item := range tr.conn[n:count] {
++		tn := n
++		if tn == 0 {
++			tn = 1
++		}
++		for _, item := range tr.conn[tn:count] {
+ 			tracerx.Printf("terminating pure SSH connection (%d -> %d)", count, n)
+ 			if err := item.End(); err != nil {
+ 				return err
+ 			}
+ 		}
+-		tr.conn = tr.conn[0:n]
++		tr.conn = tr.conn[0:tn]
+ 	} else if n > count {
+ 		for i := count; i < n; i++ {
+-			conn, _, err := startConnection(i, tr.osEnv, tr.gitEnv, tr.meta, tr.operation)
++			conn, _, controlPath, err := startConnection(i, tr.osEnv, tr.gitEnv, tr.meta, tr.operation, tr.controlPath)
+ 			if err != nil {
+ 				tracerx.Printf("failed to spawn pure SSH connection: %s", err)
+ 				return err
+ 			}
+ 			tr.conn = append(tr.conn, conn)
++			if i == 0 {
++				tr.controlPath = controlPath
++			}
++		}
++	}
++	if n == 0 && count > 0 {
++		tracerx.Printf("terminating pure SSH connection (%d -> %d)", count, n)
++		if err := tr.conn[0].End(); err != nil {
++			return err
+ 		}
++		tr.conn = nil
++		tr.controlPath = ""
+ 	}
+ 	return nil
+ }
+diff --git a/ssh/ssh.go b/ssh/ssh.go
+index b9e9fcd6..b78833ce 100644
+--- a/ssh/ssh.go
++++ b/ssh/ssh.go
+@@ -3,11 +3,11 @@ package ssh
+ import (
+ 	"fmt"
+ 	"os"
++	"path"
+ 	"path/filepath"
+ 	"regexp"
+ 	"runtime"
+ 	"strings"
+-	"syscall"
+ 
+ 	"github.com/git-lfs/git-lfs/v3/config"
+ 	"github.com/git-lfs/git-lfs/v3/subprocess"
+@@ -30,7 +30,7 @@ type SSHMetadata struct {
+ 	Path        string
+ }
+ 
+-func FormatArgs(cmd string, args []string, needShell bool, multiplex bool) (string, []string) {
++func FormatArgs(cmd string, args []string, needShell bool, multiplex bool, controlPath string) (string, []string) {
+ 	if !needShell {
+ 		return cmd, args
+ 	}
+@@ -38,12 +38,12 @@ func FormatArgs(cmd string, args []string, needShell bool, multiplex bool) (stri
+ 	return subprocess.FormatForShellQuotedArgs(cmd, args)
+ }
+ 
+-func GetLFSExeAndArgs(osEnv config.Environment, gitEnv config.Environment, meta *SSHMetadata, command, operation string, multiplexDesired bool) (string, []string, bool) {
+-	exe, args, needShell, multiplexing := GetExeAndArgs(osEnv, gitEnv, meta, multiplexDesired)
++func GetLFSExeAndArgs(osEnv config.Environment, gitEnv config.Environment, meta *SSHMetadata, command, operation string, multiplexDesired bool, multiplexControlPath string) (exe string, args []string, multiplexing bool, controlPath string) {
++	exe, args, needShell, multiplexing, controlPath := GetExeAndArgs(osEnv, gitEnv, meta, multiplexDesired, multiplexControlPath)
+ 	args = append(args, fmt.Sprintf("%s %s %s", command, meta.Path, operation))
+-	exe, args = FormatArgs(exe, args, needShell, multiplexing)
++	exe, args = FormatArgs(exe, args, needShell, multiplexing, controlPath)
+ 	tracerx.Printf("run_command: %s %s", exe, strings.Join(args, " "))
+-	return exe, args, multiplexing
++	return exe, args, multiplexing, controlPath
+ }
+ 
+ // Parse command, and if it looks like a valid command, return the ssh binary
+@@ -119,22 +119,12 @@ func getControlDir(osEnv config.Environment) (string, error) {
+ 	if dir == "" {
+ 		return os.MkdirTemp(tmpdir, pattern)
+ 	}
+-	dir = filepath.Join(dir, "git-lfs")
+-	err := os.Mkdir(dir, 0700)
+-	if err != nil {
+-		// Ideally we would use errors.Is here to check against
+-		// os.ErrExist, but that's not available on Go 1.11.
+-		perr, ok := err.(*os.PathError)
+-		if !ok || perr.Err != syscall.EEXIST {
+-			return os.MkdirTemp(tmpdir, pattern)
+-		}
+-	}
+-	return dir, nil
++	return os.MkdirTemp(dir, pattern)
+ }
+ 
+ // 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 GetExeAndArgs(osEnv config.Environment, gitEnv config.Environment, meta *SSHMetadata, multiplexDesired bool) (exe string, baseargs []string, needShell bool, multiplexing bool) {
++func GetExeAndArgs(osEnv config.Environment, gitEnv config.Environment, meta *SSHMetadata, multiplexDesired bool, multiplexControlPath string) (exe string, baseargs []string, needShell bool, multiplexing bool, controlPath string) {
+ 	var cmd string
+ 
+ 	ssh, _ := osEnv.Get("GIT_SSH")
+@@ -161,13 +151,20 @@ func GetExeAndArgs(osEnv config.Environment, gitEnv config.Environment, meta *SS
+ 	}
+ 
+ 	multiplexing = false
+-	multiplexEnabled := gitEnv.Bool("lfs.ssh.automultiplex", true)
++	multiplexEnabled := gitEnv.Bool("lfs.ssh.automultiplex", runtime.GOOS != "windows")
+ 	if variant == variantSSH && multiplexDesired && multiplexEnabled {
+-		controlPath, err := getControlDir(osEnv)
+-		if err == nil {
++		controlMasterArg := "-oControlMaster=no"
++		controlPath = multiplexControlPath
++		if multiplexControlPath == "" {
++			controlMasterArg = "-oControlMaster=yes"
++			controlDir, err := getControlDir(osEnv)
++			if err == nil {
++				controlPath = path.Join(controlDir, "lfs.sock")
++			}
++		}
++		if controlPath != "" {
+ 			multiplexing = true
+-			controlPath = filepath.Join(controlPath, "sock-%C")
+-			args = append(args, "-oControlMaster=auto", fmt.Sprintf("-oControlPath=%s", controlPath))
++			args = append(args, controlMasterArg, fmt.Sprintf("-oControlPath=%s", controlPath))
+ 		}
+ 	}
+ 
+@@ -198,7 +195,7 @@ func GetExeAndArgs(osEnv config.Environment, gitEnv config.Environment, meta *SS
+ 		args = append(args, meta.UserAndHost)
+ 	}
+ 
+-	return cmd, args, needShell, multiplexing
++	return cmd, args, needShell, multiplexing, controlPath
+ }
+ 
+ const defaultSSHCmd = "ssh"
+diff --git a/ssh/ssh_test.go b/ssh/ssh_test.go
+index 2b48025d..420d3f40 100644
+--- a/ssh/ssh_test.go
++++ b/ssh/ssh_test.go
+@@ -20,14 +20,14 @@ func TestSSHGetLFSExeAndArgs(t *testing.T) {
+ 	meta.UserAndHost = "[e-mail]"
+ 	meta.Path = "user/repo"
+ 
+-	exe, args, _ := ssh.GetLFSExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, "git-lfs-authenticate", "download", false)
++	exe, args, _, _ := ssh.GetLFSExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, "git-lfs-authenticate", "download", false, "")
+ 	assert.Equal(t, "ssh", exe)
+ 	assert.Equal(t, []string{
+ 		"[e-mail]",
+ 		"git-lfs-authenticate user/repo download",
+ 	}, args)
+ 
+-	exe, args, _ = ssh.GetLFSExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, "git-lfs-authenticate", "upload", false)
++	exe, args, _, _ = ssh.GetLFSExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, "git-lfs-authenticate", "upload", false, "")
+ 	assert.Equal(t, "ssh", exe)
+ 	assert.Equal(t, []string{
+ 		"[e-mail]",
+@@ -45,7 +45,7 @@ func TestSSHGetExeAndArgsSsh(t *testing.T) {
+ 	meta := ssh.SSHMetadata{}
+ 	meta.UserAndHost = "[e-mail]"
+ 
+-	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false))
++	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false, ""))
+ 	assert.Equal(t, "ssh", exe)
+ 	assert.Equal(t, []string{"[e-mail]"}, args)
+ }
+@@ -61,29 +61,72 @@ func TestSSHGetExeAndArgsSshCustomPort(t *testing.T) {
+ 	meta.UserAndHost = "[e-mail]"
+ 	meta.Port = "8888"
+ 
+-	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false))
++	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false, ""))
+ 	assert.Equal(t, "ssh", exe)
+ 	assert.Equal(t, []string{"-p", "8888", "[e-mail]"}, args)
+ }
+ 
+-func TestSSHGetExeAndArgsSshMultiplexing(t *testing.T) {
++func TestSSHGetExeAndArgsSshNoMultiplexing(t *testing.T) {
+ 	cli, err := lfshttp.NewClient(lfshttp.NewContext(nil, map[string]string{
+ 		"GIT_SSH_COMMAND": "",
+ 		"GIT_SSH":         "",
+-	}, nil))
++	}, map[string]string{
++		"lfs.ssh.automultiplex": "false",
++	}))
++	require.Nil(t, err)
++
++	meta := ssh.SSHMetadata{}
++	meta.UserAndHost = "[e-mail]"
++
++	exe, baseargs, needShell, multiplexing, controlPath := ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, true, "")
++	exe, args := ssh.FormatArgs(exe, baseargs, needShell, multiplexing, controlPath)
++	assert.Equal(t, "ssh", exe)
++	assert.Equal(t, false, multiplexing)
++	assert.Equal(t, []string{"[e-mail]"}, args)
++	assert.Empty(t, controlPath)
++}
++
++func TestSSHGetExeAndArgsSshMultiplexingMaster(t *testing.T) {
++	cli, err := lfshttp.NewClient(lfshttp.NewContext(nil, map[string]string{
++		"GIT_SSH_COMMAND": "",
++		"GIT_SSH":         "",
++	}, map[string]string{
++		"lfs.ssh.automultiplex": "true",
++	}))
+ 	require.Nil(t, err)
+ 
+ 	meta := ssh.SSHMetadata{}
+ 	meta.UserAndHost = "[e-mail]"
+ 
+-	exe, baseargs, needShell, multiplexing := ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, true)
+-	exe, args := ssh.FormatArgs(exe, baseargs, needShell, multiplexing)
++	exe, baseargs, needShell, multiplexing, controlPath := ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, true, "")
++	exe, args := ssh.FormatArgs(exe, baseargs, needShell, multiplexing, controlPath)
+ 	assert.Equal(t, "ssh", exe)
+-	assert.Equal(t, multiplexing, true)
++	assert.Equal(t, true, multiplexing)
+ 	assert.Equal(t, 3, len(args))
+-	assert.Equal(t, "-oControlMaster=auto", args[0])
++	assert.Equal(t, "-oControlMaster=yes", args[0])
+ 	assert.True(t, strings.HasPrefix(args[1], "-oControlPath="))
+ 	assert.Equal(t, "[e-mail]", args[2])
++	assert.NotEmpty(t, controlPath)
++}
++
++func TestSSHGetExeAndArgsSshMultiplexingExtra(t *testing.T) {
++	cli, err := lfshttp.NewClient(lfshttp.NewContext(nil, map[string]string{
++		"GIT_SSH_COMMAND": "",
++		"GIT_SSH":         "",
++	}, map[string]string{
++		"lfs.ssh.automultiplex": "true",
++	}))
++	require.Nil(t, err)
++
++	meta := ssh.SSHMetadata{}
++	meta.UserAndHost = "[e-mail]"
++
++	exe, baseargs, needShell, multiplexing, controlPath := ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, true, "/tmp/lfs/lfs.sock")
++	exe, args := ssh.FormatArgs(exe, baseargs, needShell, multiplexing, controlPath)
++	assert.Equal(t, "ssh", exe)
++	assert.Equal(t, true, multiplexing)
++	assert.Equal(t, []string{"-oControlMaster=no", "-oControlPath=/tmp/lfs/lfs.sock", "[e-mail]"}, args)
++	assert.Equal(t, "/tmp/lfs/lfs.sock", controlPath)
+ }
+ 
+ func TestSSHGetExeAndArgsPlink(t *testing.T) {
+@@ -98,7 +141,7 @@ func TestSSHGetExeAndArgsPlink(t *testing.T) {
+ 	meta := ssh.SSHMetadata{}
+ 	meta.UserAndHost = "[e-mail]"
+ 
+-	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false))
++	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false, ""))
+ 	assert.Equal(t, plink, exe)
+ 	assert.Equal(t, []string{"[e-mail]"}, args)
+ }
+@@ -116,7 +159,7 @@ func TestSSHGetExeAndArgsPlinkCustomPort(t *testing.T) {
+ 	meta.UserAndHost = "[e-mail]"
+ 	meta.Port = "8888"
+ 
+-	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false))
++	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false, ""))
+ 	assert.Equal(t, plink, exe)
+ 	assert.Equal(t, []string{"-P", "8888", "[e-mail]"}, args)
+ }
+@@ -135,7 +178,7 @@ func TestSSHGetExeAndArgsPlinkCustomPortExplicitEnvironment(t *testing.T) {
+ 	meta.UserAndHost = "[e-mail]"
+ 	meta.Port = "8888"
+ 
+-	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false))
++	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false, ""))
+ 	assert.Equal(t, plink, exe)
+ 	assert.Equal(t, []string{"-P", "8888", "[e-mail]"}, args)
+ }
+@@ -154,7 +197,7 @@ func TestSSHGetExeAndArgsPlinkCustomPortExplicitEnvironmentPutty(t *testing.T) {
+ 	meta.UserAndHost = "[e-mail]"
+ 	meta.Port = "8888"
+ 
+-	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false))
++	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false, ""))
+ 	assert.Equal(t, plink, exe)
+ 	assert.Equal(t, []string{"-P", "8888", "[e-mail]"}, args)
+ }
+@@ -173,7 +216,7 @@ func TestSSHGetExeAndArgsPlinkCustomPortExplicitEnvironmentSsh(t *testing.T) {
+ 	meta.UserAndHost = "[e-mail]"
+ 	meta.Port = "8888"
+ 
+-	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false))
++	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false, ""))
+ 	assert.Equal(t, plink, exe)
+ 	assert.Equal(t, []string{"-p", "8888", "[e-mail]"}, args)
+ }
+@@ -190,7 +233,7 @@ func TestSSHGetExeAndArgsTortoisePlink(t *testing.T) {
+ 	meta := ssh.SSHMetadata{}
+ 	meta.UserAndHost = "[e-mail]"
+ 
+-	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false))
++	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false, ""))
+ 	assert.Equal(t, plink, exe)
+ 	assert.Equal(t, []string{"-batch", "[e-mail]"}, args)
+ }
+@@ -208,7 +251,7 @@ func TestSSHGetExeAndArgsTortoisePlinkCustomPort(t *testing.T) {
+ 	meta.UserAndHost = "[e-mail]"
+ 	meta.Port = "8888"
+ 
+-	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false))
++	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false, ""))
+ 	assert.Equal(t, plink, exe)
+ 	assert.Equal(t, []string{"-batch", "-P", "8888", "[e-mail]"}, args)
+ }
+@@ -227,7 +270,7 @@ func TestSSHGetExeAndArgsTortoisePlinkCustomPortExplicitEnvironment(t *testing.T
+ 	meta.UserAndHost = "[e-mail]"
+ 	meta.Port = "8888"
+ 
+-	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false))
++	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false, ""))
+ 	assert.Equal(t, plink, exe)
+ 	assert.Equal(t, []string{"-batch", "-P", "8888", "[e-mail]"}, args)
+ }
+@@ -248,7 +291,7 @@ func TestSSHGetExeAndArgsTortoisePlinkCustomPortExplicitConfig(t *testing.T) {
+ 	meta.UserAndHost = "[e-mail]"
+ 	meta.Port = "8888"
+ 
+-	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false))
++	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false, ""))
+ 	assert.Equal(t, plink, exe)
+ 	assert.Equal(t, []string{"-batch", "-P", "8888", "[e-mail]"}, args)
+ }
+@@ -268,7 +311,7 @@ func TestSSHGetExeAndArgsTortoisePlinkCustomPortExplicitConfigOverride(t *testin
+ 	meta.UserAndHost = "[e-mail]"
+ 	meta.Port = "8888"
+ 
+-	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false))
++	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false, ""))
+ 	assert.Equal(t, plink, exe)
+ 	assert.Equal(t, []string{"-P", "8888", "[e-mail]"}, args)
+ }
+@@ -284,7 +327,7 @@ func TestSSHGetExeAndArgsSshCommandPrecedence(t *testing.T) {
+ 	meta := ssh.SSHMetadata{}
+ 	meta.UserAndHost = "[e-mail]"
+ 
+-	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false))
++	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false, ""))
+ 	assert.Equal(t, "sh", exe)
+ 	assert.Equal(t, []string{"-c", "sshcmd [e-mail]"}, args)
+ }
+@@ -299,7 +342,7 @@ func TestSSHGetExeAndArgsSshCommandArgs(t *testing.T) {
+ 	meta := ssh.SSHMetadata{}
+ 	meta.UserAndHost = "[e-mail]"
+ 
+-	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false))
++	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false, ""))
+ 	assert.Equal(t, "sh", exe)
+ 	assert.Equal(t, []string{"-c", "sshcmd --args 1 [e-mail]"}, args)
+ }
+@@ -314,7 +357,7 @@ func TestSSHGetExeAndArgsSshCommandArgsWithMixedQuotes(t *testing.T) {
+ 	meta := ssh.SSHMetadata{}
+ 	meta.UserAndHost = "[e-mail]"
+ 
+-	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false))
++	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false, ""))
+ 	assert.Equal(t, "sh", exe)
+ 	assert.Equal(t, []string{"-c", "sshcmd foo 'bar \"baz\"' [e-mail]"}, args)
+ }
+@@ -329,7 +372,7 @@ func TestSSHGetExeAndArgsSshCommandCustomPort(t *testing.T) {
+ 	meta.UserAndHost = "[e-mail]"
+ 	meta.Port = "8888"
+ 
+-	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false))
++	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false, ""))
+ 	assert.Equal(t, "sh", exe)
+ 	assert.Equal(t, []string{"-c", "sshcmd -p 8888 [e-mail]"}, args)
+ }
+@@ -345,7 +388,7 @@ func TestSSHGetExeAndArgsCoreSshCommand(t *testing.T) {
+ 	meta := ssh.SSHMetadata{}
+ 	meta.UserAndHost = "[e-mail]"
+ 
+-	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false))
++	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false, ""))
+ 	assert.Equal(t, "sh", exe)
+ 	assert.Equal(t, []string{"-c", "sshcmd --args 2 [e-mail]"}, args)
+ }
+@@ -359,7 +402,7 @@ func TestSSHGetExeAndArgsCoreSshCommandArgsWithMixedQuotes(t *testing.T) {
+ 	meta := ssh.SSHMetadata{}
+ 	meta.UserAndHost = "[e-mail]"
+ 
+-	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false))
++	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false, ""))
+ 	assert.Equal(t, "sh", exe)
+ 	assert.Equal(t, []string{"-c", "sshcmd foo 'bar \"baz\"' [e-mail]"}, args)
+ }
+@@ -373,7 +416,7 @@ func TestSSHGetExeAndArgsConfigVersusEnv(t *testing.T) {
+ 	meta := ssh.SSHMetadata{}
+ 	meta.UserAndHost = "[e-mail]"
+ 
+-	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false))
++	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false, ""))
+ 	assert.Equal(t, "sh", exe)
+ 	assert.Equal(t, []string{"-c", "sshcmd --args 1 [e-mail]"}, args)
+ }
+@@ -389,7 +432,7 @@ func TestSSHGetExeAndArgsPlinkCommand(t *testing.T) {
+ 	meta := ssh.SSHMetadata{}
+ 	meta.UserAndHost = "[e-mail]"
+ 
+-	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false))
++	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false, ""))
+ 	assert.Equal(t, "sh", exe)
+ 	assert.Equal(t, []string{"-c", plink + " [e-mail]"}, args)
+ }
+@@ -406,7 +449,7 @@ func TestSSHGetExeAndArgsPlinkCommandCustomPort(t *testing.T) {
+ 	meta.UserAndHost = "[e-mail]"
+ 	meta.Port = "8888"
+ 
+-	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false))
++	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false, ""))
+ 	assert.Equal(t, "sh", exe)
+ 	assert.Equal(t, []string{"-c", plink + " -P 8888 [e-mail]"}, args)
+ }
+@@ -422,7 +465,7 @@ func TestSSHGetExeAndArgsTortoisePlinkCommand(t *testing.T) {
+ 	meta := ssh.SSHMetadata{}
+ 	meta.UserAndHost = "[e-mail]"
+ 
+-	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false))
++	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false, ""))
+ 	assert.Equal(t, "sh", exe)
+ 	assert.Equal(t, []string{"-c", plink + " -batch [e-mail]"}, args)
+ }
+@@ -439,7 +482,7 @@ func TestSSHGetExeAndArgsTortoisePlinkCommandCustomPort(t *testing.T) {
+ 	meta.UserAndHost = "[e-mail]"
+ 	meta.Port = "8888"
+ 
+-	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false))
++	exe, args := ssh.FormatArgs(ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &meta, false, ""))
+ 	assert.Equal(t, "sh", exe)
+ 	assert.Equal(t, []string{"-c", plink + " -batch -P 8888 [e-mail]"}, args)
+ }
+@@ -460,7 +503,7 @@ func TestSSHGetLFSExeAndArgsWithCustomSSH(t *testing.T) {
+ 	assert.Equal(t, "[e-mail]", e.SSHMetadata.UserAndHost)
+ 	assert.Equal(t, "/repo", e.SSHMetadata.Path)
+ 
+-	exe, args, _ := ssh.GetLFSExeAndArgs(cli.OSEnv(), cli.GitEnv(), &e.SSHMetadata, "git-lfs-authenticate", "download", false)
++	exe, args, _, _ := ssh.GetLFSExeAndArgs(cli.OSEnv(), cli.GitEnv(), &e.SSHMetadata, "git-lfs-authenticate", "download", false, "")
+ 	assert.Equal(t, "not-ssh", exe)
+ 	assert.Equal(t, []string{"-p", "12345", "[e-mail]", "git-lfs-authenticate /repo download"}, args)
+ }
+@@ -478,7 +521,7 @@ func TestSSHGetLFSExeAndArgsInvalidOptionsAsHost(t *testing.T) {
+ 	assert.Equal(t, "-oProxyCommand=gnome-calculator", e.SSHMetadata.UserAndHost)
+ 	assert.Equal(t, "/repo", e.SSHMetadata.Path)
+ 
+-	exe, args, _ := ssh.GetLFSExeAndArgs(cli.OSEnv(), cli.GitEnv(), &e.SSHMetadata, "git-lfs-authenticate", "download", false)
++	exe, args, _, _ := ssh.GetLFSExeAndArgs(cli.OSEnv(), cli.GitEnv(), &e.SSHMetadata, "git-lfs-authenticate", "download", false, "")
+ 	assert.Equal(t, "ssh", exe)
+ 	assert.Equal(t, []string{"--", "-oProxyCommand=gnome-calculator", "git-lfs-authenticate /repo download"}, args)
+ }
+@@ -499,7 +542,7 @@ func TestSSHGetLFSExeAndArgsInvalidOptionsAsHostWithCustomSSH(t *testing.T) {
+ 	assert.Equal(t, "--oProxyCommand=gnome-calculator", e.SSHMetadata.UserAndHost)
+ 	assert.Equal(t, "/repo", e.SSHMetadata.Path)
+ 
+-	exe, args, _ := ssh.GetLFSExeAndArgs(cli.OSEnv(), cli.GitEnv(), &e.SSHMetadata, "git-lfs-authenticate", "download", false)
++	exe, args, _, _ := ssh.GetLFSExeAndArgs(cli.OSEnv(), cli.GitEnv(), &e.SSHMetadata, "git-lfs-authenticate", "download", false, "")
+ 	assert.Equal(t, "not-ssh", exe)
+ 	assert.Equal(t, []string{"oProxyCommand=gnome-calculator", "git-lfs-authenticate /repo download"}, args)
+ }
+@@ -517,7 +560,7 @@ func TestSSHGetExeAndArgsInvalidOptionsAsHost(t *testing.T) {
+ 	assert.Equal(t, "-oProxyCommand=gnome-calculator", e.SSHMetadata.UserAndHost)
+ 	assert.Equal(t, "", e.SSHMetadata.Path)
+ 
+-	exe, args, needShell, _ := ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &e.SSHMetadata, false)
++	exe, args, needShell, _, _ := ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &e.SSHMetadata, false, "")
+ 	assert.Equal(t, "ssh", exe)
+ 	assert.Equal(t, []string{"--", "-oProxyCommand=gnome-calculator"}, args)
+ 	assert.Equal(t, false, needShell)
+@@ -536,7 +579,7 @@ func TestSSHGetExeAndArgsInvalidOptionsAsPath(t *testing.T) {
+ 	assert.Equal(t, "[e-mail]", e.SSHMetadata.UserAndHost)
+ 	assert.Equal(t, "/-oProxyCommand=gnome-calculator", e.SSHMetadata.Path)
+ 
+-	exe, args, needShell, _ := ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &e.SSHMetadata, false)
++	exe, args, needShell, _, _ := ssh.GetExeAndArgs(cli.OSEnv(), cli.GitEnv(), &e.SSHMetadata, false, "")
+ 	assert.Equal(t, "ssh", exe)
+ 	assert.Equal(t, []string{"[e-mail]"}, args)
+ 	assert.Equal(t, false, needShell)
+diff --git a/t/cmd/lfs-ssh-echo.go b/t/cmd/lfs-ssh-echo.go
+index f1319bde..b51ce611 100644
+--- a/t/cmd/lfs-ssh-echo.go
++++ b/t/cmd/lfs-ssh-echo.go
+@@ -60,7 +60,38 @@ func main() {
+ 	offset := 1
+ 
+ 	checkSufficientArgs(offset)
+-	if os.Args[offset] == "-oControlMaster=auto" {
++	if masterArg, found := strings.CutPrefix(os.Args[offset], "-oControlMaster="); found {
++		var master bool
++		switch masterArg {
++		case "yes":
++			master = true
++		case "no":
++			master = false
++		default:
++			fmt.Fprintf(os.Stderr, "expected \"-oControlMaster=yes\" or \"-oControlMaster=no\", got %q", os.Args[offset])
++			os.Exit(1)
++		}
++		if pathArg, found := strings.CutPrefix(os.Args[offset+1], "-oControlPath="); found {
++			if master {
++				if file, err := os.OpenFile(pathArg, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0); err != nil {
++					fmt.Fprintf(os.Stderr, "expected %q to not exist", pathArg)
++					os.Exit(1)
++				} else {
++					file.Close()
++					defer os.Remove(pathArg)
++				}
++			} else {
++				if file, err := os.OpenFile(pathArg, os.O_RDONLY, 0); err != nil {
++					fmt.Fprintf(os.Stderr, "expected %q to exist", pathArg)
++					os.Exit(1)
++				} else {
++					file.Close()
++				}
++			}
++		} else {
++			fmt.Fprintf(os.Stderr, "expected \"-oControlPath\"")
++			os.Exit(1)
++		}
+ 		offset += 2
+ 	}
+ 
+-- 
+2.52.0
+
diff --git a/debian/patches/0002-tq-transfer_test.go-enable-and-fix-all-tests.patch b/debian/patches/0002-tq-transfer_test.go-enable-and-fix-all-tests.patch
new file mode 100644
index 0000000..6491781
--- /dev/null
+++ b/debian/patches/0002-tq-transfer_test.go-enable-and-fix-all-tests.patch
@@ -0,0 +1,181 @@
+From 8b3b2eb4a764747393f1e1c59d571471009005f7 Mon Sep 17 00:00:00 2001
+From: Chris Darroch <[e-mail]>
+Date: Wed, 26 Jul 2023 17:20:23 -0700
+Subject: [PATCH 2/3] tq/transfer_test.go: enable and fix all tests
+
+The three test functions in the tq/transfer_test.go source file are
+all named with the prefix "test" rather than "Test", and as a result,
+do not actually execute.  This oversight dates from the original
+introduction of these tests in the "transfer" package in commit
+10623f5d7a7d785fb3863c2b190b0f2f99686b7c of PR #1265.  (The package
+was later renamed to the current "tq" package in commit
+891db97a429405f80d54c7e09219bda9799e8e6e of PR #1780.)
+
+We therefore change the test function names to begin with "Test",
+and resolve several test regressions which have accumulated since the
+tests were first added.
+
+First, the TestBasicAdapterExists() function calls the
+GetDownloadAdapterNames() and GetUploadAdapterNames() methods of the
+Manifest structure, and these now return the names of three transfer
+adapter implementations rather than just the original "basic" one,
+so we allow for all three names to appear in any order.  (The
+"lfs-standalone-file" adapter was added in commit
+bb05cf5053d9abd6d7ca68354ca9663e57bb6737 of PR #3748, and the "ssh"
+adapter was added in commit 594f8e386cce3441e06c9094ab5e251f0e07ca1f
+of PR #4446.)
+
+Second, the TestAdapterRegAndOverride() function expects the
+NewDownloadAdapter() and NewUploadAdapter() methods of the Manifest
+structure to return nil if the provided name argument does not match
+that of any registered transfer adapter.  However, this has not been
+the behaviour of those methods since commit
+c5c2a756c70b2a961cea284fc7b00d2753bfaa3b of PR #1279, shortly after
+the tests were first introduced in PR #1265.  In that commit, the
+NewAdapterOrDefault() method was added, and the NewDownloadAdapter()
+and NewUploadAdapter() methods revised to call it, so they return the
+default "basic" adapter if the requested name does not match a
+registered adapter.  We therefore revise and expand the test to
+account for this behaviour, and also make sure to directly test the
+underlying NewAdapter() method, which retains the originally intended
+behaviour and returns nil if it does not find a matching adapter
+for the provided name argument.
+
+Third, although the TestAdapterRegButBasicOnly() function passes without
+changes, it no longer fully performs the checks it was intended to make,
+since the NewDownloadAdapter() and NewUploadAdapter() methods now always
+return a non-nil value, so using a non-nil response from them to prove
+that the "test" adapter was found is insufficient.  We therefore update
+the test to confirm that the returned value from these functions is
+a "test" adapter, as expected, and not just a "basic" one.
+
+We also replace the use of the BasicAdapterName variable with the
+"basic" string to align with the other tests.
+---
+ tq/transfer_test.go | 66 ++++++++++++++++++++++++++++++++++-----------
+ 1 file changed, 51 insertions(+), 15 deletions(-)
+
+diff --git a/tq/transfer_test.go b/tq/transfer_test.go
+index 3a3e1b0e..6b73fce3 100644
+--- a/tq/transfer_test.go
++++ b/tq/transfer_test.go
+@@ -41,18 +41,18 @@ func newRenamedTestAdapter(name string, dir Direction) Adapter {
+ 	return &testAdapter{"RENAMED", dir}
+ }
+ 
+-func testBasicAdapterExists(t *testing.T) {
++func TestBasicAdapterExists(t *testing.T) {
+ 	m := NewManifest(nil, nil, "", "")
+ 
+ 	assert := assert.New(t)
+ 
+ 	dls := m.GetDownloadAdapterNames()
+ 	if assert.NotNil(dls) {
+-		assert.Equal([]string{"basic"}, dls)
++		assert.ElementsMatch([]string{"basic", "lfs-standalone-file", "ssh"}, dls)
+ 	}
+ 	uls := m.GetUploadAdapterNames()
+ 	if assert.NotNil(uls) {
+-		assert.Equal([]string{"basic"}, uls)
++		assert.ElementsMatch([]string{"basic", "lfs-standalone-file", "ssh"}, dls)
+ 	}
+ 
+ 	da := m.NewDownloadAdapter("basic")
+@@ -68,25 +68,52 @@ func testBasicAdapterExists(t *testing.T) {
+ 	}
+ }
+ 
+-func testAdapterRegAndOverride(t *testing.T) {
++func TestAdapterRegAndOverride(t *testing.T) {
+ 	m := NewManifest(nil, nil, "", "")
+ 	assert := assert.New(t)
+ 
+-	assert.Nil(m.NewDownloadAdapter("test"))
+-	assert.Nil(m.NewUploadAdapter("test"))
++	assert.Nil(m.NewAdapter("test", Download))
++	assert.Nil(m.NewAdapter("test", Upload))
++
++	da := m.NewDownloadAdapter("test")
++	if assert.NotNil(da) {
++		assert.Equal("basic", da.Name())
++		assert.Equal(Download, da.Direction())
++	}
++
++	ua := m.NewUploadAdapter("test")
++	if assert.NotNil(ua) {
++		assert.Equal("basic", ua.Name())
++		assert.Equal(Upload, ua.Direction())
++	}
+ 
+ 	m.RegisterNewAdapterFunc("test", Upload, newTestAdapter)
+-	assert.Nil(m.NewDownloadAdapter("test"))
+-	assert.NotNil(m.NewUploadAdapter("test"))
++	assert.Nil(m.NewAdapter("test", Download))
++	assert.NotNil(m.NewAdapter("test", Upload))
++
++	da = m.NewDownloadAdapter("test")
++	if assert.NotNil(da) {
++		assert.Equal("basic", da.Name())
++		assert.Equal(Download, da.Direction())
++	}
++
++	ua = m.NewUploadAdapter("test")
++	if assert.NotNil(ua) {
++		assert.Equal("test", ua.Name())
++		assert.Equal(Upload, ua.Direction())
++	}
+ 
+ 	m.RegisterNewAdapterFunc("test", Download, newTestAdapter)
+-	da := m.NewDownloadAdapter("test")
++	assert.NotNil(m.NewAdapter("test", Download))
++	assert.NotNil(m.NewAdapter("test", Upload))
++
++	da = m.NewDownloadAdapter("test")
+ 	if assert.NotNil(da) {
+ 		assert.Equal("test", da.Name())
+ 		assert.Equal(Download, da.Direction())
+ 	}
+ 
+-	ua := m.NewUploadAdapter("test")
++	ua = m.NewUploadAdapter("test")
+ 	if assert.NotNil(ua) {
+ 		assert.Equal("test", ua.Name())
+ 		assert.Equal(Upload, ua.Direction())
+@@ -114,7 +141,7 @@ func testAdapterRegAndOverride(t *testing.T) {
+ 	}
+ }
+ 
+-func testAdapterRegButBasicOnly(t *testing.T) {
++func TestAdapterRegButBasicOnly(t *testing.T) {
+ 	cli, err := lfsapi.NewClient(lfshttp.NewContext(nil, nil, map[string]string{
+ 		"lfs.basictransfersonly": "yes",
+ 	}))
+@@ -127,12 +154,21 @@ func testAdapterRegButBasicOnly(t *testing.T) {
+ 	m.RegisterNewAdapterFunc("test", Upload, newTestAdapter)
+ 	m.RegisterNewAdapterFunc("test", Download, newTestAdapter)
+ 	// Will still be created if we ask for them
+-	assert.NotNil(m.NewUploadAdapter("test"))
+-	assert.NotNil(m.NewDownloadAdapter("test"))
++	da := m.NewDownloadAdapter("test")
++	if assert.NotNil(da) {
++		assert.Equal("test", da.Name())
++		assert.Equal(Download, da.Direction())
++	}
++
++	ua := m.NewUploadAdapter("test")
++	if assert.NotNil(ua) {
++		assert.Equal("test", ua.Name())
++		assert.Equal(Upload, ua.Direction())
++	}
+ 
+ 	// But list will exclude
+ 	ld := m.GetDownloadAdapterNames()
+-	assert.Equal([]string{BasicAdapterName}, ld)
++	assert.Equal([]string{"basic"}, ld)
+ 	lu := m.GetUploadAdapterNames()
+-	assert.Equal([]string{BasicAdapterName}, lu)
++	assert.Equal([]string{"basic"}, lu)
+ }
+-- 
+2.52.0
+
diff --git a/debian/patches/0003-tq-transfer-copy-Id-and-Token.patch b/debian/patches/0003-tq-transfer-copy-Id-and-Token.patch
new file mode 100644
index 0000000..f20e5ab
--- /dev/null
+++ b/debian/patches/0003-tq-transfer-copy-Id-and-Token.patch
@@ -0,0 +1,37 @@
+From d5c3fd3115e2a51fdd83fd22b01a45c81f36f490 Mon Sep 17 00:00:00 2001
+From: Kyle Edwards <[e-mail]>
+Date: Mon, 2 Oct 2023 16:22:02 -0400
+Subject: [PATCH 3/3] tq/transfer: copy Id and Token
+
+SSH connections that return id and/or token from batch require these
+fields for get-object and put-object. Properly copy them when making
+a copy of a transfer in newTransfer().
+---
+ tq/transfer.go | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tq/transfer.go b/tq/transfer.go
+index 22fb832d..dbb4b896 100644
+--- a/tq/transfer.go
++++ b/tq/transfer.go
+@@ -109,6 +109,8 @@ func newTransfer(tr *Transfer, name string, path string) *Transfer {
+ 			Header:    action.Header,
+ 			ExpiresAt: action.ExpiresAt,
+ 			ExpiresIn: action.ExpiresIn,
++			Id:        action.Id,
++			Token:     action.Token,
+ 			createdAt: action.createdAt,
+ 		}
+ 	}
+@@ -122,6 +124,8 @@ func newTransfer(tr *Transfer, name string, path string) *Transfer {
+ 				Header:    link.Header,
+ 				ExpiresAt: link.ExpiresAt,
+ 				ExpiresIn: link.ExpiresIn,
++				Id:        link.Id,
++				Token:     link.Token,
+ 				createdAt: link.createdAt,
+ 			}
+ 		}
+-- 
+2.52.0
+
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..0605dc1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+0001-ssh-Specifically-designate-a-master-multiplex-connec.patch
+0002-tq-transfer_test.go-enable-and-fix-all-tests.patch
+0003-tq-transfer-copy-Id-and-Token.patch
\ No newline at end of file