Fix issue 36, Push not working if no remote branch is specified

If no remote branch is specified the push fails due to trailing ':' on Command
passed to git.exe
Also corrected typo on push dialog

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index 3c1fb48..cf78dfa 100644 (file)
Binary files a/src/Resources/TortoiseProcENG.rc and b/src/Resources/TortoiseProcENG.rc differ

diff --git a/src/TortoiseProc/Commands/PushCommand.cpp b/src/TortoiseProc/Commands/PushCommand.cpp
index 9dbf656..16317e9 100644 (file)
--- a/src/TortoiseProc/Commands/PushCommand.cpp
+++ b/src/TortoiseProc/Commands/PushCommand.cpp
@@ -47,11 +47,14 @@ bool PushCommand::Execute()
                if(dlg.m_bForce)\r
                        force=_T("--force");\r
                \r
-               cmd.Format(_T("git.exe push %s %s %s \"%s\" %s:%s"),\r
+               cmd.Format(_T("git.exe push %s %s %s \"%s\" %s"),\r
                                thin,tags,force,\r
                                dlg.m_URL,\r
-                               dlg.m_BranchSourceName,\r
-                               dlg.m_BranchRemoteName);\r
+                               dlg.m_BranchSourceName);\r
+               if (!dlg.m_BranchRemoteName.IsEmpty())\r
+               {\r
+                       cmd += _T(":") + dlg.m_BranchRemoteName;\r
+               }\r
 \r
                CProgressDlg progress;\r
                progress.m_GitCmd=cmd;\r