From b1490276f42ea402a8ffbf44e93a02bdac4f8570 Mon Sep 17 00:00:00 2001 From: Johannes Rudolph Date: Fri, 21 Jun 2024 21:32:14 +0200 Subject: [PATCH] refactor: simplify counting local commits with library function --- .../meshcloud/dockerosb/persistence/GitHandlerService.kt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/io/meshcloud/dockerosb/persistence/GitHandlerService.kt b/src/main/kotlin/io/meshcloud/dockerosb/persistence/GitHandlerService.kt index e765829..4a1cf80 100644 --- a/src/main/kotlin/io/meshcloud/dockerosb/persistence/GitHandlerService.kt +++ b/src/main/kotlin/io/meshcloud/dockerosb/persistence/GitHandlerService.kt @@ -190,12 +190,10 @@ open class GitHandlerService( fun hasLocalCommits(): Boolean { val origin = git.repository.resolve("origin/${gitConfig.remoteBranch}") - val head = git.getRepository().resolve("HEAD") + val head = git.repository.resolve("HEAD") - var count = 0 - for (entry in git.log().addRange(origin, head).call()) { - ++count - } + val range = git.log().addRange(origin, head).call() + val count = range.count() if (count > 0) { log.info { "Your branch is ahead of 'origin/${gitConfig.remoteBranch}' by $count commit(s)." }