From d26c5b1f67af8a4fa28569e086b4248d8c6445fe Mon Sep 17 00:00:00 2001
From: "Kyle J. McKay" <mackyle@gmail.com>
Date: Thu, 8 Feb 2018 15:12:56 -0800
Subject: [PATCH] git-svn: provide an SVN_SSH script

Provide an SVN_SSH setting and corresponding script so that any
ssh command invoked indirectly when Girocco runs git-svn on an
ssh URL uses the correct ssh configuration file.

Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
---
 bin/git-svn-ssh | 6 ++++++
 shlib.sh        | 2 ++
 2 files changed, 8 insertions(+)
 create mode 100755 bin/git-svn-ssh

diff --git a/bin/git-svn-ssh b/bin/git-svn-ssh
new file mode 100755
index 0000000..0e31967
--- /dev/null
+++ b/bin/git-svn-ssh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Run ssh using the correct config file as located
+# in the chroot for ssh.
+
+exec ssh -F @chroot@/etc/girocco/.ssh/config "$@"
diff --git a/shlib.sh b/shlib.sh
index 8162109..f8cc2eb 100644
--- a/shlib.sh
+++ b/shlib.sh
@@ -193,6 +193,7 @@ PAGER="cat"
 GIT_ASKPASS="$cfg_basedir/bin/git-askpass-password"
 GIT_SVN_NOTTY=1
 GIROCCO_SUPPRESS_AUTO_GC_UPDATE=1
+SVN_SSH="$cfg_basedir/bin/git-svn-ssh"
 export XDG_CONFIG_HOME
 export HOME
 export TMPDIR
@@ -205,6 +206,7 @@ export PAGER
 export GIT_ASKPASS
 export GIT_SVN_NOTTY
 export GIROCCO_SUPPRESS_AUTO_GC_UPDATE
+export SVN_SSH
 unset GIT_USER_AGENT
 unset GIT_HTTP_USER_AGENT
 if [ -n "$defined_cfg_git_client_ua" ]; then
-- 
2.11.4.GIT