From: Frank Li <lznuaa@gmail.com>
Date: Mon, 29 Jun 2009 08:29:50 +0000 (+0800)
Subject: Add messagebox to ask if stash change when rebase at dirty work space
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c41dcfb5d7972e26bdb4aaf46fa468c84a44736e;p=tortoisegit%2FTortoiseGitJp.git

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