From 24a9341b2c0e026fbbbce550c08374947edd5e7c Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 3 Apr 2011 16:53:46 +0200 Subject: [PATCH] Rebase failed at revision with empty commit message. Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/TortoiseProc/RebaseDlg.cpp | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/src/Changelog.txt b/src/Changelog.txt index be97594b1..ffc1b886f 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -40,6 +40,7 @@ * Fixed issue #766: "Switch/Checkout" dialog: "Track" should be disabled when no new branch is created * Fixed issue #765: "Check for Updates" in about box doesn't work * Fixed issue #731: Git Command Progress Window text box doesn't have a context menu. + * Rebase failed at revision with empty commit message. * TortoiseGitCache Partly rewritten to fix various issues. diff --git a/src/TortoiseProc/RebaseDlg.cpp b/src/TortoiseProc/RebaseDlg.cpp index b5fe36a31..848445171 100644 --- a/src/TortoiseProc/RebaseDlg.cpp +++ b/src/TortoiseProc/RebaseDlg.cpp @@ -1244,6 +1244,12 @@ int CRebaseDlg::DoRebase() log.Format(_T("%s %d: %s"),CTGitPath::GetActionName(mode),this->GetCurrentCommitID(),pRev->m_CommitHash.ToString()); AddLogString(log); AddLogString(pRev->GetSubject()); + if (pRev->GetSubject().IsEmpty()) + { + CMessageBox::Show(m_hWnd, _T("Found an empty commit message. You have to enter one or rebase cannot proceed."), _T("TortoiseGit"), MB_OK | MB_ICONEXCLAMATION); + mode = CTGitPath::LOGACTIONS_REBASE_EDIT; + } + cmd.Format(_T("git.exe cherry-pick %s %s"),nocommit,pRev->m_CommitHash.ToString()); if(g_Git.Run(cmd,&out,CP_UTF8)) -- 2.11.4.GIT