From 1676c02f0f3a8b5a2665b4296cf16a0efa3bcc9c Mon Sep 17 00:00:00 2001 From: Sup Yut Sum Date: Sat, 2 Mar 2013 19:34:58 +0800 Subject: [PATCH] Fixed issue #1679: Reset dialog pick another revision has no effect Signed-off-by: Sup Yut Sum --- src/Changelog.txt | 1 + src/TortoiseProc/AppUtils.cpp | 2 +- src/TortoiseProc/ResetDlg.cpp | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index bfaf0557c..3d3635240 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -31,6 +31,7 @@ Released: unreleased * Fixed issue #1646: TortoiseGit Log gives undeterministic results (log does not apply --boundary any more by default) * Fixed issue #1085: Small commit with lots of unversioned and not ignored files takes very long * Fixed issue #1675: delete/ignore does not delete folder from repo when local copy is kept + * Fixed issue #1679: Reset dialog pick another revision has no effect = Release 1.8.1.0 = Released: 2013-02-07 diff --git a/src/TortoiseProc/AppUtils.cpp b/src/TortoiseProc/AppUtils.cpp index 8f173c37b..dae2c1ec8 100644 --- a/src/TortoiseProc/AppUtils.cpp +++ b/src/TortoiseProc/AppUtils.cpp @@ -1358,7 +1358,7 @@ bool CAppUtils::GitReset(CString *CommitHash,int type) type=_T("--mixed"); break; } - cmd.Format(_T("git.exe reset %s %s"),type, *CommitHash); + cmd.Format(_T("git.exe reset %s %s"),type, dlg.m_ResetToVersion); while (true) { diff --git a/src/TortoiseProc/ResetDlg.cpp b/src/TortoiseProc/ResetDlg.cpp index 58105ca66..9a5b60351 100644 --- a/src/TortoiseProc/ResetDlg.cpp +++ b/src/TortoiseProc/ResetDlg.cpp @@ -113,6 +113,8 @@ void CResetDlg::OnVersionChanged() void CResetDlg::OnOK() { + this->UpdateData(TRUE); + UpdateRevsionName(); m_ResetToVersion = m_VersionName; m_ResetType=this->GetCheckedRadioButton(IDC_RADIO_RESET_SOFT,IDC_RADIO_RESET_HARD)-IDC_RADIO_RESET_SOFT; return CHorizontalResizableStandAloneDialog::OnOK(); -- 2.11.4.GIT