OSDN Git Service
(root)
/
tortoisegit
/
TortoiseGitJp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fd087b3
)
Fix pull don't launch putty key file
author
Frank Li
<lznuaa@gmail.com>
Fri, 5 Jun 2009 15:43:57 +0000
(23:43 +0800)
committer
Frank Li
<lznuaa@gmail.com>
Fri, 5 Jun 2009 15:43:57 +0000
(23:43 +0800)
Signed-off-by: Frank Li <lznuaa@gmail.com>
src/TortoiseProc/Commands/PullCommand.cpp
patch
|
blob
|
history
diff --git
a/src/TortoiseProc/Commands/PullCommand.cpp
b/src/TortoiseProc/Commands/PullCommand.cpp
index
33c6978
..
ddab7fe
100644
(file)
--- a/
src/TortoiseProc/Commands/PullCommand.cpp
+++ b/
src/TortoiseProc/Commands/PullCommand.cpp
@@
-26,6
+26,7
@@
#include "PullFetchDlg.h"
\r
#include "ProgressDlg.h"
\r
#include "FileDiffDlg.h"
\r
+#include "AppUtils.h"
\r
\r
bool PullCommand::Execute()
\r
{
\r
@@
-35,6
+36,12
@@
bool PullCommand::Execute()
{
\r
CString url;
\r
url=dlg.m_RemoteURL;
\r
+
\r
+ if(dlg.m_bAutoLoad)
\r
+ {
\r
+ CAppUtils::LaunchPAgent(NULL,&dlg.m_RemoteURL);
\r
+ }
\r
+
\r
CString cmd;
\r
CString hashOld = g_Git.GetHash(L"HEAD");
\r
cmd.Format(_T("git.exe pull \"%s\" %s"),url,dlg.m_RemoteBranchName);
\r