From: Sven Strickroth <email@cs-ware.de>
Date: Sat, 4 Jan 2014 10:30:57 +0000 (+0100)
Subject: Installer: Detect TortoiseGitPlink from TortoiseGit
X-Git-Url: https://repo.or.cz/w/msysgit.git/commitdiff_plain/8a920b987f73d2d1b27e51a5a344b1d0fd91f43d

Installer: Detect TortoiseGitPlink from TortoiseGit

TortoiseGit comes with a Git optimized version of TortoisePlink called TortoiseGitPLink. A new name was chosen so that TortoisePLink provides the exact same results as the TortoiseSVN version.

Main change to TortoiseGitPlink is that the "-batch" parameter which causes problems in TortoisePlink is ignored (see http://code.google.com/p/tortoisegit/issues/detail?id=1617).

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---

diff --git a/share/WinGit/putty.inc.iss b/share/WinGit/putty.inc.iss
index 42e76616..38b791eb 100644
--- a/share/WinGit/putty.inc.iss
+++ b/share/WinGit/putty.inc.iss
@@ -10,6 +10,7 @@ const
 // Tries to detect the path to a PuTTY installation / an application that comes
 // with an improved version of Plink. TortoisePlink from TortoiseGit/SVN features a
 // GUI dialog to accept new host keys, for example.
+// Prefer TortoiseGitPlink (optimized for Git) over TortoisePlink.
 function GuessPlinkExecutable:string;
 begin
     // Prefer TortoisePlink over vanilla Plink for its GUI dialog to accept host keys.
@@ -31,6 +32,11 @@ begin
     end;
 
     if DirExists(Result) then begin
+        if FileExists(Result+'TortoiseGitPlink.exe') then begin
+            Result:=Result+'TortoiseGitPlink.exe'
+            Exit;
+        end;
+
         Result:=Result+'TortoisePlink.exe'
         Exit;
     end;