[asterisk-scf-commits] asterisk-scf/integration/gitall.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  36d3ad013172b00516f51a30108b1f7c46c3e5a0 (commit)
      from  04e92c95fb002f241ca8861c8c5cf89cfb9ae3bb (commit)

Summary of changes:
 gitall-asterisk-scf.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


- Log -----------------------------------------------------------------
commit 36d3ad013172b00516f51a30108b1f7c46c3e5a0
Author: David M. Lee <dlee at digium.com>
Date:   Tue Jan 25 10:03:27 2011 -0600

    Don't prompt for SSH key password on Win using Putty.

diff --git a/gitall-asterisk-scf.sh b/gitall-asterisk-scf.sh
index c028faf..b35b878 100755
--- a/gitall-asterisk-scf.sh
+++ b/gitall-asterisk-scf.sh
@@ -254,7 +254,8 @@ function dry_run()
 #
 
 # if we don't already have an ssh-agent running, fire one up
-if test ${SSH_AUTH_SOCK-no} = no; then
+# if GIT_SSH is set, presumably you're on Windows and using plink and pageant
+if test ${SSH_AUTH_SOCK-no} = no && test "${GIT_SSH-no}" = no; then
     eval `ssh-agent`
 
     echo "SSH_AGENT_PID = ${SSH_AGENT_PID}"

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/gitall.git