Fixed issue #109: clone on bare local repository fails

Clear trail slash \ or/

Signed-off-by: Frank Li <lznuaa@gmail.com>

diff --git a/src/TortoiseProc/AppUtils.cpp b/src/TortoiseProc/AppUtils.cpp
index 0abb67d..9f2b6c4 100644 (file)
--- a/src/TortoiseProc/AppUtils.cpp
+++ b/src/TortoiseProc/AppUtils.cpp
@@ -2116,3 +2116,16 @@ bool CAppUtils::CreateMultipleDirectory(CString& szPath)
 \r
     return bSuccess;\r
 }\r
+\r
+void CAppUtils::RemoveTrailSlash(CString &path)\r
+{\r
+       if(path.IsEmpty())\r
+               return ;\r
+       \r
+       while(path[path.GetLength()-1] == _T('\\') || path[path.GetLength()-1] == _T('/' ) )\r
+       {\r
+               path=path.Left(path.GetLength()-1);\r
+               if(path.IsEmpty())\r
+                       return;\r
+       }\r
+}
\ No newline at end of file

diff --git a/src/TortoiseProc/AppUtils.h b/src/TortoiseProc/AppUtils.h
index e2d98f4..41f79b2 100644 (file)
--- a/src/TortoiseProc/AppUtils.h
+++ b/src/TortoiseProc/AppUtils.h
@@ -204,6 +204,8 @@ public:
 \r
        static bool CreateMultipleDirectory(CString &dir);\r
 \r
+       static void RemoveTrailSlash(CString &path);\r
+\r
 private:\r
        static CString PickDiffTool(const CTGitPath& file1, const CTGitPath& file2);\r
        static bool GetMimeType(const CTGitPath& file, CString& mimetype);\r

diff --git a/src/TortoiseProc/Commands/CloneCommand.cpp b/src/TortoiseProc/Commands/CloneCommand.cpp
index 14b123a..890deb0 100644 (file)
--- a/src/TortoiseProc/Commands/CloneCommand.cpp
+++ b/src/TortoiseProc/Commands/CloneCommand.cpp
@@ -38,8 +38,13 @@ bool CloneCommand::Execute()
                {\r
                        CAppUtils::LaunchPAgent(&dlg.m_strPuttyKeyFile);\r
                }\r
+       \r
+               CAppUtils::RemoveTrailSlash(dlg.m_Directory);\r
+               CAppUtils::RemoveTrailSlash(dlg.m_URL);\r
+\r
                CString dir=dlg.m_Directory;\r
                CString url=dlg.m_URL;\r
+\r
                // is this a windows format UNC path, ie starts with \\ \r
                if (url.Find(_T("\\\\")) == 0)\r
                {\r