Fixed issue #155: Fix SVN Rebase sets upstream as remotes/trunk

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / Commands / AddCommand.cpp

diff --git a/src/TortoiseProc/Commands/AddCommand.cpp b/src/TortoiseProc/Commands/AddCommand.cpp
index 63a0772..f20f85a 100644 (file)
--- a/src/TortoiseProc/Commands/AddCommand.cpp
+++ b/src/TortoiseProc/Commands/AddCommand.cpp
@@ -55,12 +55,13 @@ bool AddCommand::Execute()
                        dlg.m_pathList = pathList;\r
                        if (dlg.DoModal() == IDOK)\r
                        {\r
+#if 0\r
                                CString cmd,out;\r
                                int success=0;\r
                                for(int i=0;i<dlg.m_pathList.GetCount();i++)\r
                                {\r
-                                       cmd.Format(_T("git.exe add \"%s\""),dlg.m_pathList[i].GetGitPathString());\r
-                                       if(g_Git.Run(cmd,&out,CP_OEMCP))\r
+                                       cmd.Format(_T("git.exe add -- \"%s\""),dlg.m_pathList[i].GetGitPathString());\r
+                                       if(g_Git.Run(cmd,&out,CP_ACP))\r
                                        {\r
                                                CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);\r
                                        }\r
@@ -70,24 +71,29 @@ bool AddCommand::Execute()
                                message.Format(_T("%d file added"),success);\r
                                CMessageBox::Show(NULL,message,_T("TortoiseGit"),MB_OK);\r
                                return TRUE;\r
-#if 0\r
+#endif\r
+\r
                                if (dlg.m_pathList.GetCount() == 0)\r
                                        return FALSE;\r
-                               CSVNProgressDlg progDlg;\r
+                               CGitProgressDlg progDlg;\r
                                theApp.m_pMainWnd = &progDlg;\r
-                               progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Add);\r
+                               progDlg.SetCommand(CGitProgressDlg::GitProgress_Add);\r
                                if (parser.HasVal(_T("closeonend")))\r
                                        progDlg.SetAutoClose(parser.GetLongVal(_T("closeonend")));\r
                                progDlg.SetPathList(dlg.m_pathList);\r
-                               ProjectProperties props;\r
-                               props.ReadPropsPathList(dlg.m_pathList);\r
-                               progDlg.SetProjectProperties(props);\r
+                               //ProjectProperties props;\r
+                               //props.ReadPropsPathList(dlg.m_pathList);\r
+                               //progDlg.SetProjectProperties(props);\r
                                progDlg.SetItemCount(dlg.m_pathList.GetCount());\r
                                progDlg.DoModal();\r
+\r
+                               CShellUpdater::Instance().AddPathsForUpdate(dlg.m_pathList);\r
+\r
                                bRet = !progDlg.DidErrorsOccur();\r
-#endif\r
+\r
                        }\r
        //      }\r
        }\r
+       CShellUpdater::Instance().Flush();\r
        return bRet;\r
 }\r