Fixed rebase interactive taking the wrong message

Fixes #165
JetpackDuba · Jun 14, 2024 · 59de2f3 · 59de2f3
1 parent d40a027
commit 59de2f3
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/StatusViewModel.kt b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/StatusViewModel.kt
@@ -301,9 +301,17 @@ class StatusViewModel @Inject constructor(
 
     private fun messageByRepoState(git: Git): String {
         val message: String? =
-            if (
+            if (git.repository.repositoryState.isRebasing) {
+                val rebaseMergeDir = File(git.repository.directory, "rebase-merge")
+                val messageFile = File(rebaseMergeDir, "message")
+
+                if (messageFile.exists()) {
+                    runCatching { messageFile.readText() }.getOrNull() ?: ""
+                } else {
+                    ""
+                }
+            } else if (
                 git.repository.repositoryState.isMerging ||
-                git.repository.repositoryState.isRebasing ||
                 git.repository.repositoryState.isReverting ||
                 git.repository.repositoryState.isCherryPicking
             ) {