From b1e9350eb8fcd816d1cd48f56c910a7bd62dc4ba Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Sun, 26 Jul 2015 02:19:45 +0200
Subject: [PATCH] SyncDlg: Update view after rebase is performed

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

diff --git a/src/TortoiseProc/SyncDlg.cpp b/src/TortoiseProc/SyncDlg.cpp
index 9b88369f6..eb720e4cb 100644
--- a/src/TortoiseProc/SyncDlg.cpp
+++ b/src/TortoiseProc/SyncDlg.cpp
@@ -405,18 +405,17 @@ void CSyncDlg::FetchComplete()
 {
 	EnableControlButton(true);
 	SwitchToInput();
-	this->FetchOutList(true);
 
 	if (g_Git.UsingLibGit2(CGit::GIT_CMD_FETCH))
 		ShowTab(IDC_CMD_GIT_PROG);
 	else
 		ShowTab(IDC_REFLIST);
 
-	if (m_GitCmdStatus)
-		return;
-
-	if (m_CurrentCmd != GIT_COMMAND_FETCHANDREBASE)
+	if (m_GitCmdStatus || m_CurrentCmd != GIT_COMMAND_FETCHANDREBASE)
+	{
+		FetchOutList(true);
 		return;
+	}
 
 	CString remote;
 	CString remotebranch;
@@ -462,11 +461,15 @@ void CSyncDlg::FetchComplete()
 				}
 			};
 			mergeProgress.DoModal();
+			FillNewRefMap();
+			FetchOutList(true);
 			return;
 		}
 	}
 
 	CAppUtils::RebaseAfterFetch(upstream);
+	FillNewRefMap();
+	FetchOutList(true);
 }
 
 void CSyncDlg::StashComplete()
-- 
2.11.4.GIT