From c9b20ded3061e34a1eb00a7228e23bf360fd5b8b Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Fri, 27 Sep 2013 22:00:38 +0200
Subject: [PATCH] Don't trim "git clone " on e.g. pull dialog

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 src/TortoiseProc/AppUtils.cpp | 9 ++++-----
 src/TortoiseProc/AppUtils.h   | 2 +-
 src/TortoiseProc/CloneDlg.cpp | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/TortoiseProc/AppUtils.cpp b/src/TortoiseProc/AppUtils.cpp
index 2a5aad35c..958dd1cc4 100644
--- a/src/TortoiseProc/AppUtils.cpp
+++ b/src/TortoiseProc/AppUtils.cpp
@@ -1950,7 +1950,7 @@ bool CAppUtils::IsSSHPutty()
 	return false;
 }
 
-CString CAppUtils::GetClipboardLink()
+CString CAppUtils::GetClipboardLink(const CString &skipGitPrefix)
 {
 	if (!OpenClipboard(NULL))
 		return CString();
@@ -1995,11 +1995,10 @@ CString CAppUtils::GetClipboardLink()
 					|| (sClipboardText[0] >= 'a' &&  sClipboardText[0] <= 'z') )
 					return sClipboardText;
 
-		// trim "git clone " prefix
-		CString gitClonePrefix = _T("git clone ");
-		if (sClipboardText.Find(gitClonePrefix) == 0)
+		// trim prefixes like "git clone "
+		if (!skipGitPrefix.IsEmpty() && sClipboardText.Find(skipGitPrefix) == 0)
 		{
-			CString args = sClipboardText.Mid(gitClonePrefix.GetLength()).Trim();
+			CString args = sClipboardText.Mid(skipGitPrefix.GetLength()).Trim();
 			int quotePos = -1;
 			if (args.GetLength() && args[0] == '"')
 			{
diff --git a/src/TortoiseProc/AppUtils.h b/src/TortoiseProc/AppUtils.h
index 3839c4d87..547044c51 100644
--- a/src/TortoiseProc/AppUtils.h
+++ b/src/TortoiseProc/AppUtils.h
@@ -177,7 +177,7 @@ public:
 
 	static bool LaunchPAgent(CString *keyfile=NULL,CString * pRemote=NULL);
 
-	static CString GetClipboardLink();
+	static CString GetClipboardLink(const CString &skipGitPrefix = _T(""));
 	static CString ChooseRepository(CString *path);
 
 	static bool SendPatchMail(CTGitPathList &pathlist,bool autoclose=false);
diff --git a/src/TortoiseProc/CloneDlg.cpp b/src/TortoiseProc/CloneDlg.cpp
index 7ef6c4c59..451c404a7 100644
--- a/src/TortoiseProc/CloneDlg.cpp
+++ b/src/TortoiseProc/CloneDlg.cpp
@@ -139,7 +139,7 @@ BOOL CCloneDlg::OnInitDialog()
 	m_URLCombo.LoadHistory(_T("Software\\TortoiseGit\\History\\repoURLS"), _T("url"));
 	if(m_URL.IsEmpty())
 	{
-		CString str=CAppUtils::GetClipboardLink();
+		CString str = CAppUtils::GetClipboardLink(_T("git clone "));
 		str.Trim();
 		if(str.IsEmpty())
 			m_URLCombo.SetCurSel(0);
-- 
2.11.4.GIT