Julian/Gitnuro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed rebase interactive taking the wrong message

Browse Source 
Fixes #165
This commit is contained in:
Abdelilah El Aissaoui 2024-06-15 01:06:50 +02:00
parent d40a027fdc
commit 59de2f358a
No known key found for this signature in database
GPG Key ID: 7587FC860F594869
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/StatusViewModel.kt
View File

@ -301,9 +301,17 @@ class StatusViewModel @Inject constructor(
private fun messageByRepoState(git: Git): String { private fun messageByRepoState(git: Git): String {
val message: 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.isMerging ||
git.repository.repositoryState.isRebasing ||
git.repository.repositoryState.isReverting || git.repository.repositoryState.isReverting ||
git.repository.repositoryState.isCherryPicking git.repository.repositoryState.isCherryPicking
) { ) {