OSDN Git Service

Don't reset unversion file at commit
authorFrank Li <lznuaa@gmail.com>
Fri, 3 Apr 2009 03:13:27 +0000 (11:13 +0800)
committerFrank Li <lznuaa@gmail.com>
Fri, 3 Apr 2009 03:13:27 +0000 (11:13 +0800)
Signed-off-by: Frank Li <lznuaa@gmail.com>
src/TortoiseProc/CommitDlg.cpp

index b9f792a..e6b4723 100644 (file)
@@ -420,9 +420,9 @@ void CCommitDlg::OnOK()
                                cmd.Format(_T("git.exe rm --cache -- \"%s\""),entry->GetGitPathString());\r
                                g_Git.Run(cmd,&out,CP_ACP);     \r
                        }\r
-                       else\r
+                       else if(!( entry->m_Action & CTGitPath::LOGACTIONS_UNVER ) )\r
                        {\r
-                               cmd.Format(_T("git.exe reset -- %s"),entry->GetGitPathString());\r
+                               cmd.Format(_T("git.exe reset -- \"%s\""),entry->GetGitPathString());\r
                                g_Git.Run(cmd,&out,CP_ACP);\r
                        }\r
 \r