From 01b08270579680a4c2359b51dfeabe7022332acd Mon Sep 17 00:00:00 2001 From: Abdelilah El Aissaoui Date: Sat, 2 Nov 2024 23:53:07 +0100 Subject: [PATCH] Fixed commit message disappear if pre-commit hook fails Fixes #248 --- src/main/kotlin/com/jetpackduba/gitnuro/ui/UncommitedChanges.kt | 1 - .../com/jetpackduba/gitnuro/viewmodels/StatusViewModel.kt | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/UncommitedChanges.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/UncommitedChanges.kt index 4f9dd2c..4efc4ee 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/UncommitedChanges.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/UncommitedChanges.kt @@ -89,7 +89,6 @@ fun UncommittedChanges( val doCommit = { statusViewModel.commit(commitMessage) onStagedDiffEntrySelected(null) - setCommitMessage("") } val canCommit = commitMessage.isNotEmpty() && stageStateUi.hasStagedFiles diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/StatusViewModel.kt b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/StatusViewModel.kt index a538db5..3fbc3ac 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/StatusViewModel.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/StatusViewModel.kt @@ -395,7 +395,9 @@ class StatusViewModel @Inject constructor( val personIdent = getPersonIdent(git) doCommitUseCase(git, commitMessage, amend, personIdent) + updateCommitMessage("") + _commitMessageChangesFlow.emit("") _isAmend.value = false positiveNotification(if (isAmend.value) "Commit amended" else "New commit created")