From b139beafc5df3071effa77d490657146d604164f Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 3 May 2012 23:47:53 +0200 Subject: [PATCH] Fixed issue #1155: TortoiseGit SVN rebase finish dialog produces very big dialog box Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/TortoiseProc/Commands/SVNRebaseCommand.cpp | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index 196688f64..3b6af9bb8 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -24,6 +24,7 @@ Released: unreleased * Fixed issue #1141: Sync dialog local branch combo box too short * Fixed issue #1130: Sync dialog forgets the remote branch every time * Fixed issue #1144: Cancel button on commit dialog works very slow + * Fixed issue #1155: TortoiseGit SVN rebase finish dialog produces very big dialog box = Release 1.7.8.0 = Released: 2012-04-01 diff --git a/src/TortoiseProc/Commands/SVNRebaseCommand.cpp b/src/TortoiseProc/Commands/SVNRebaseCommand.cpp index 9e50c62f0..0b6291b47 100644 --- a/src/TortoiseProc/Commands/SVNRebaseCommand.cpp +++ b/src/TortoiseProc/Commands/SVNRebaseCommand.cpp @@ -106,12 +106,13 @@ bool SVNRebaseCommand::Execute() CString ff; if(g_Git.IsFastForward(CString(_T("HEAD")),out)) { - cmd.Format(_T("git.exe reset --hard %s"),out); - if (g_Git.Run(cmd, &ff, CP_UTF8)) - { - CMessageBox::Show(NULL,ff,_T("TortoiseGit"),MB_OK|MB_ICONERROR); + CProgressDlg progressReset; + cmd.Format(_T("git.exe reset --hard %s"), out); + progressReset.m_GitCmd = cmd; + progressReset.m_bAutoCloseOnSuccess = true; + + if (progressReset.DoModal() != IDOK) return false; - } else { CMessageBox::Show(NULL,CString(_T("Fast Forward: "))+ff,_T("TortoiseGit"),MB_OK); -- 2.11.4.GIT