From 882c7c6ac01690c683569742d10d4f3bb4fd156a Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Tue, 19 May 2015 17:41:33 +0200 Subject: [PATCH] Do not ask to stash before opening rebase dlg (fixes issue #2509) Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/TortoiseProc/Commands/RebaseCommand.cpp | 30 ----------------------------- 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index b8712a492..531b593a7 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -12,6 +12,7 @@ Released: unreleased * Fixed issue #2507: Support keyboard shortcuts in yes/no prompts * Fixed issue #2496: LogDlg: Controls may overlap on screen resolution change * Fixed issue #2153: Log window resize should expand commit list + * Fixed issue #2509: Prompt for stash before rebase is not matched with pop stash after rebase = Release 1.8.14.0 = Released: 2015-04-08 diff --git a/src/TortoiseProc/Commands/RebaseCommand.cpp b/src/TortoiseProc/Commands/RebaseCommand.cpp index 7e9262828..ad1b86c6c 100644 --- a/src/TortoiseProc/Commands/RebaseCommand.cpp +++ b/src/TortoiseProc/Commands/RebaseCommand.cpp @@ -20,44 +20,14 @@ #include "stdafx.h" #include "RebaseCommand.h" -#include "MessageBox.h" #include "RebaseDlg.h" #include "Git.h" -#include "SysProgressDlg.h" #include "AppUtils.h" bool RebaseCommand::Execute() { bool bRet =false; - if(!g_Git.CheckCleanWorkTree()) - { - if (CMessageBox::Show(NULL, IDS_ERROR_NOCLEAN_STASH, IDS_APPNAME, 1, IDI_QUESTION, IDS_STASHBUTTON, IDS_ABORTBUTTON) == 1) - { - CSysProgressDlg sysProgressDlg; - sysProgressDlg.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME))); - sysProgressDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_STASHRUNNING))); - sysProgressDlg.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT))); - sysProgressDlg.SetShowProgressBar(false); - sysProgressDlg.SetCancelMsg(IDS_PROGRS_INFOFAILED); - sysProgressDlg.ShowModeless((HWND)NULL, true); - - CString cmd,out; - cmd=_T("git.exe stash"); - if (g_Git.Run(cmd, &out, CP_UTF8)) - { - sysProgressDlg.Stop(); - CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK); - return false; - } - sysProgressDlg.Stop(); - } - else - { - return false; - } - } - while(1) { CRebaseDlg dlg; -- 2.11.4.GIT