Fixed issue #111: Undo Add does not work (keep added file) and enable "F5" at revert...

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

diff --git a/src/Git/Git.cpp b/src/Git/Git.cpp
index 35c5a65..864684b 100644 (file)
--- a/src/Git/Git.cpp
+++ b/src/Git/Git.cpp
@@ -1117,7 +1117,8 @@ int CGit::Revert(CTGitPath &path,bool keep)
        CString cmd, out;\r
        if(path.m_Action & CTGitPath::LOGACTIONS_ADDED)\r
        {       //To init git repository, there are not HEAD, so we can use git reset command\r
-               cmd.Format(_T("git.exe rm --cache -- \"%s\""),path.GetGitPathString());\r
+               cmd.Format(_T("git.exe rm --cached \"%s\""),path.GetGitPathString());\r
+\r
                if(g_Git.Run(cmd,&out,CP_ACP))\r
                        return -1;\r
        }\r

diff --git a/src/TortoiseProc/Commands/RevertCommand.cpp b/src/TortoiseProc/Commands/RevertCommand.cpp
index 53dabdc..1b0dd70 100644 (file)
--- a/src/TortoiseProc/Commands/RevertCommand.cpp
+++ b/src/TortoiseProc/Commands/RevertCommand.cpp
@@ -29,6 +29,8 @@ bool RevertCommand::Execute()
        dlg.m_pathList = pathList;\r
        if (dlg.DoModal() == IDOK)\r
        {\r
+               \r
+//             g_Git.Revert(dlg.m_selectedPathList,true);\r
 \r
                CGitProgressDlg progDlg;\r
                theApp.m_pMainWnd = &progDlg;\r

diff --git a/src/TortoiseProc/RevertDlg.cpp b/src/TortoiseProc/RevertDlg.cpp
index b37d254..aabb408 100644 (file)
--- a/src/TortoiseProc/RevertDlg.cpp
+++ b/src/TortoiseProc/RevertDlg.cpp
@@ -108,6 +108,8 @@ UINT CRevertDlg::RevertThread()
        DialogEnableWindow(IDOK, false);\r
        m_bCancelled = false;\r
 \r
+       m_RevertList.Clear();\r
+\r
        if (!m_RevertList.GetStatus(&m_pathList))\r
        {\r
                m_RevertList.SetEmptyString(m_RevertList.GetLastErrorMessage());\r

diff --git a/src/TortoiseProc/SVNProgressDlg.cpp b/src/TortoiseProc/SVNProgressDlg.cpp
index 88b6542..fb5eef1 100644 (file)
--- a/src/TortoiseProc/SVNProgressDlg.cpp
+++ b/src/TortoiseProc/SVNProgressDlg.cpp
@@ -2465,9 +2465,9 @@ bool CGitProgressDlg::CmdRevert(CString& sWindowTitle, bool& localoperation)
        SetWindowText(sWindowTitle);\r
        SetBackgroundImage(IDI_REVERT_BKG);\r
 \r
-       CTGitPathList delList = m_selectedPaths;\r
-       if (DWORD(CRegDWORD(_T("Software\\TortoiseGit\\RevertWithRecycleBin"), TRUE)))\r
-               delList.DeleteAllFiles(true);\r
+       //CTGitPathList delList = m_selectedPaths;\r
+       //if (DWORD(CRegDWORD(_T("Software\\TortoiseGit\\RevertWithRecycleBin"), TRUE)))\r
+       //      delList.DeleteAllFiles(true);\r
 \r
        ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_REVERT)));\r
        for(int i=0;i<m_selectedPaths.GetCount();i++)\r
@@ -2481,7 +2481,7 @@ bool CGitProgressDlg::CmdRevert(CString& sWindowTitle, bool& localoperation)
                Notify(m_selectedPaths[i],git_wc_notify_revert);\r
        }\r
 \r
-       CShellUpdater::Instance().AddPathsForUpdate(m_targetPathList);\r
+       CShellUpdater::Instance().AddPathsForUpdate(m_selectedPaths);\r
 \r
        return true;\r
 }\r