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

Fix empty merges not being allowed

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2023-06-02 00:35:10 +02:00
parent d3d2b606b4
commit b2dc0ecc50
No known key found for this signature in database
GPG Key ID: 7587FC860F594869
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/kotlin/com/jetpackduba/gitnuro/git/workspace/DoCommitUseCase.kt
View File

@ -1,8 +1,10 @@
package com.jetpackduba.gitnuro.git.workspace
import com.jetpackduba.gitnuro.extensions.isMerging
import com.jetpackduba.gitnuro.git.author.LoadAuthorUseCase
import com.jetpackduba.gitnuro.git.config.LoadSignOffConfigUseCase
import com.jetpackduba.gitnuro.git.config.LocalConfigConstants
import com.jetpackduba.gitnuro.git.repository.GetRepositoryStateUseCase
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import org.eclipse.jgit.api.Git
@ -13,6 +15,7 @@ import javax.inject.Inject
class DoCommitUseCase @Inject constructor(
private val loadSignOffConfigUseCase: LoadSignOffConfigUseCase,
private val loadAuthorUseCase: LoadAuthorUseCase,
private val getRepositoryStateUseCase: GetRepositoryStateUseCase
) {
suspend operator fun invoke(
git: Git,
@ -33,9 +36,12 @@ class DoCommitUseCase @Inject constructor(
} else
message
val state = getRepositoryStateUseCase(git)
val isMerging = state.isMerging
git.commit()
.setMessage(finalMessage)
.setAllowEmpty(amend) // Only allow empty commits when amending
.setAllowEmpty(amend || isMerging) // Only allow empty commits when amending
.setAmend(amend)
.setAuthor(author)
.call()