From 49f2f37d84b0395d0102ed12476dbf7681fe4f9c Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Sun, 1 May 2011 07:37:44 +0200
Subject: [PATCH] correctly mark squashed revisions as done (if those are not
 the last ones)

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 src/TortoiseProc/RebaseDlg.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/TortoiseProc/RebaseDlg.cpp b/src/TortoiseProc/RebaseDlg.cpp
index b407508d7..88e4cb50b 100644
--- a/src/TortoiseProc/RebaseDlg.cpp
+++ b/src/TortoiseProc/RebaseDlg.cpp
@@ -1309,7 +1309,8 @@ int CRebaseDlg::DoRebase()
 			// let user edit last commmit message
 			this->m_RebaseStage = REBASE_SQUASH_EDIT;
 			return -1;
-		}
+		} else if(mode == CTGitPath::LOGACTIONS_REBASE_SQUASH)
+			pRev->GetAction(&m_CommitList)|= CTGitPath::LOGACTIONS_REBASE_DONE;
 	}
 	
 	return 0;
-- 
2.11.4.GIT