From 9a85846c920181121d447328d1beaf4bbaf3b824 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sat, 25 Apr 2015 15:15:18 +0200 Subject: [PATCH] Fix cycling through rebase statuses using space Fixes a regression of 7e5c0479277edf1c52029c9f85cb155ef9505556. Signed-off-by: Sven Strickroth --- src/TortoiseProc/GitLogListAction.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/TortoiseProc/GitLogListAction.cpp b/src/TortoiseProc/GitLogListAction.cpp index 0b397b11e..08837275b 100644 --- a/src/TortoiseProc/GitLogListAction.cpp +++ b/src/TortoiseProc/GitLogListAction.cpp @@ -1168,8 +1168,6 @@ void CGitLogList::ShiftSelectedRebaseAction() while(pos) { index = GetNextSelectedItem(pos); - if (index == GetItemCount() - 1) - continue; int *action = &((GitRevLoglist*)m_arShownList[index])->GetRebaseAction(); switch (*action) { @@ -1181,6 +1179,8 @@ void CGitLogList::ShiftSelectedRebaseAction() break; case LOGACTIONS_REBASE_EDIT: *action = LOGACTIONS_REBASE_SQUASH; + if (index == GetItemCount() - 1) + *action = LOGACTIONS_REBASE_PICK; break; case LOGACTIONS_REBASE_SQUASH: *action= LOGACTIONS_REBASE_PICK; -- 2.11.4.GIT