From ed2cd572cfb0cc5e14bbbed41783bb1285174c4b Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Wed, 23 Mar 2016 14:26:05 +0100 Subject: [PATCH] Fixed issue #2728: Cherry Pick is not working in case of conflict and empty message Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/TortoiseProc/RebaseDlg.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index 4d5c299ff..4a2c243dc 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -13,6 +13,7 @@ Released: unreleased * Fixed issue #2732: Commit dialog: Message field should have focus (when patch is shown) * Fixed issue #2730: Pull with rebase with preserve merges not working for noops * Fixed issue #2740: Order of compared references in revision graph is labelled inverted + * Fixed issue #2728: Cherry Pick is not working in case of conflict and empty message = Release 2.0.0 = Released: 2016-02-29 diff --git a/src/TortoiseProc/RebaseDlg.cpp b/src/TortoiseProc/RebaseDlg.cpp index 9106f1185..07baab3d2 100644 --- a/src/TortoiseProc/RebaseDlg.cpp +++ b/src/TortoiseProc/RebaseDlg.cpp @@ -1288,7 +1288,7 @@ void CRebaseDlg::OnBnClickedContinue() CString out =_T(""); CString cmd; - cmd.Format(_T("git.exe commit -C %s"), (LPCTSTR)curRev->m_CommitHash.ToString()); + cmd.Format(_T("git.exe commit --allow-empty-message -C %s"), (LPCTSTR)curRev->m_CommitHash.ToString()); AddLogString(cmd); -- 2.11.4.GIT