From 765d0e9d96241a4490c2bb4b52c6a576eabd505a Mon Sep 17 00:00:00 2001
From: Abdelilah El Aissaoui <aeab13@gmail.com>
Date: Wed, 22 Jun 2022 18:42:38 +0200
Subject: [PATCH] Fixed cherry-pick not refreshing status.

Required when the cherry-pick has conflicts.
---
 src/main/kotlin/app/viewmodels/LogViewModel.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/kotlin/app/viewmodels/LogViewModel.kt b/src/main/kotlin/app/viewmodels/LogViewModel.kt
index 5db24ce..50dc471 100644
--- a/src/main/kotlin/app/viewmodels/LogViewModel.kt
+++ b/src/main/kotlin/app/viewmodels/LogViewModel.kt
@@ -158,7 +158,7 @@ class LogViewModel @Inject constructor(
     }
 
     fun cherrypickCommit(revCommit: RevCommit) = tabState.safeProcessing(
-        refreshType = RefreshType.ONLY_LOG,
+        refreshType = RefreshType.UNCOMMITED_CHANGES_AND_LOG,
     ) { git ->
         mergeManager.cherryPickCommit(git, revCommit)
     }