Add messagebox to ask if stash change when rebase at dirty work space

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

diff --git a/src/TortoiseProc/Commands/RebaseCommand.cpp b/src/TortoiseProc/Commands/RebaseCommand.cpp
index c7df2ae..33e03bf 100644 (file)
--- a/src/TortoiseProc/Commands/RebaseCommand.cpp
+++ b/src/TortoiseProc/Commands/RebaseCommand.cpp
@@ -34,8 +34,20 @@ bool RebaseCommand::Execute()
        \r
        if(!g_Git.CheckCleanWorkTree())\r
        {\r
-               CMessageBox::Show(NULL,_T("Rebase Require Clean Working Tree"),_T("TortoiseGit"),MB_OK);\r
-               return false;           \r
+               if(CMessageBox::Show(NULL,      IDS_ERROR_NOCLEAN_STASH,IDS_APPNAME,MB_YESNO|MB_ICONINFORMATION)==IDYES)\r
+               {\r
+                       CString cmd,out;\r
+                       cmd=_T("git.exe stash");\r
+                       if(g_Git.Run(cmd,&out,CP_ACP))\r
+                       {\r
+                               CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);\r
+                               return false;\r
+                       }\r
+\r
+               }else\r
+               {\r
+                       return false;\r
+               }\r
        }\r
 \r
        CRebaseDlg dlg;\r