From 5e1d03c9ecae04b80ba05fd60982ba26d0a3f1fc Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Tue, 13 Nov 2018 21:20:30 +0100
Subject: [PATCH] Add special entries to reflog regarding rebase

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

diff --git a/src/TortoiseProc/RebaseDlg.cpp b/src/TortoiseProc/RebaseDlg.cpp
index 00523429e..aabbe36a0 100644
--- a/src/TortoiseProc/RebaseDlg.cpp
+++ b/src/TortoiseProc/RebaseDlg.cpp
@@ -1036,6 +1036,19 @@ int CRebaseDlg::StartRebase()
 
 	if( !this->m_IsCherryPick )
 	{
+		if (g_Git.m_IsUseLibGit2)
+		{
+			CAutoRepository repo(g_Git.GetGitRepository());
+			CAutoReflog reflog;
+			git_reflog_read(reflog.GetPointer(), repo, "HEAD");
+			CAutoSignature signature;
+			if (git_signature_default(signature.GetPointer(), repo) < 0)
+				return -1;
+
+			git_reflog_append(reflog, m_OrigHEADHash, signature, "rebase: start (" + CUnicodeUtils::GetUTF8(m_OrigHEADBranch) + " on " + CUnicodeUtils::GetUTF8(m_OrigUpstreamHash.ToString()) + ")");
+			git_reflog_write(reflog);
+		}
+
 		cmd.Format(L"git.exe checkout -f %s --", (LPCTSTR)m_OrigUpstreamHash.ToString());
 		this->AddLogString(cmd);
 		if (RunGitCmdRetryOrAbort(cmd))
@@ -1132,6 +1145,17 @@ int CRebaseDlg::FinishRebase()
 	if (RunGitCmdRetryOrAbort(cmd))
 		return -1;
 
+	if (g_Git.m_IsUseLibGit2)
+	{
+		CAutoRepository repo(g_Git.GetGitRepository());
+		CAutoReflog reflog;
+		git_reflog_read(reflog.GetPointer(), repo, "HEAD");
+		CAutoSignature signature;
+		git_signature_default(signature.GetPointer(), repo);
+		git_reflog_append(reflog, m_OrigHEADHash, signature, "rebase: finished");
+		git_reflog_write(reflog);
+	}
+
 	while (m_ctrlTabCtrl.GetTabsNum() > 1)
 		m_ctrlTabCtrl.RemoveTab(0);
 	m_CtrlStatusText.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_REBASEFINISHED)));
@@ -2429,6 +2453,18 @@ void CRebaseDlg::OnBnClickedAbort()
 		goto end;
 
 	m_ctrlTabCtrl.SetActiveTab(REBASE_TAB_LOG);
+
+	if (g_Git.m_IsUseLibGit2 && !m_IsCherryPick)
+	{
+		CAutoRepository repo(g_Git.GetGitRepository());
+		CAutoReflog reflog;
+		git_reflog_read(reflog.GetPointer(), repo, "HEAD");
+		CAutoSignature signature;
+		git_signature_default(signature.GetPointer(), repo);
+		git_reflog_append(reflog, m_OrigHEADHash, signature, "rebase: begin aborting...");
+		git_reflog_write(reflog);
+	}
+
 	if(this->m_IsFastForward)
 	{
 		CString cmd;
@@ -2498,6 +2534,16 @@ void CRebaseDlg::OnBnClickedAbort()
 			}
 		}
 	}
+	if (g_Git.m_IsUseLibGit2)
+	{
+		CAutoRepository repo(g_Git.GetGitRepository());
+		CAutoReflog reflog;
+		git_reflog_read(reflog.GetPointer(), repo, "HEAD");
+		CAutoSignature signature;
+		git_signature_default(signature.GetPointer(), repo);
+		git_reflog_append(reflog, m_OrigHEADHash, signature, "rebase: aborted");
+		git_reflog_write(reflog);
+	}
 	__super::OnCancel();
 end:
 	CleanUpRebaseActiveFolder();
-- 
2.11.4.GIT