From 5fea152632610b2866106b1b6fcb9c80258109e4 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Wed, 29 Dec 2021 17:01:44 +0100 Subject: [PATCH] Fixed issue #3834: Log window hangs on pasting wrong SHA-1 into commit log list when "working tree changes" are selected Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/TortoiseProc/LogDlg.cpp | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index 2aa4f645f..010680ad2 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -38,6 +38,7 @@ Released: unreleased * Fixed issue #3799: Display of Long lines with Chinese characters is truncated in TortoiseGitMerge dialog * Fixed issue #3836: TortoiseGitMerge: With line wrapping enabled, show the current column as in the wrapped line, not as the visible column * Fixed issue #3837: TortoiseGitMerge support link is outdated + * Fixed issue #3834: Log window hangs on pasting wrong SHA-1 into commit log list when "working tree changes" are selected = Release 2.12.0 = Released: 2021-03-31 diff --git a/src/TortoiseProc/LogDlg.cpp b/src/TortoiseProc/LogDlg.cpp index 7d90b871a..283b282ee 100644 --- a/src/TortoiseProc/LogDlg.cpp +++ b/src/TortoiseProc/LogDlg.cpp @@ -1729,7 +1729,10 @@ void CLogDlg::JumpToGitHash(CString hash) for (int i = currentPos + 1; i != currentPos; ++i) { if (i >= cnt) - i = 0; + { + i = -1; + continue; + } GitRev* rev = m_LogList.m_arShownList.SafeGetAt(i); if (!rev) continue; -- 2.11.4.GIT