From 05326f3a1df5dbaf2bd82d3292837a3f9fbd1a60 Mon Sep 17 00:00:00 2001 From: Abdelilah El Aissaoui Date: Sun, 12 Dec 2021 01:07:42 +0100 Subject: [PATCH] Fixed crash when being detached from any branch --- .../kotlin/app/extensions/RefExtensions.kt | 35 +++++++++++++------ 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/src/main/kotlin/app/extensions/RefExtensions.kt b/src/main/kotlin/app/extensions/RefExtensions.kt index 4711048..7db3244 100644 --- a/src/main/kotlin/app/extensions/RefExtensions.kt +++ b/src/main/kotlin/app/extensions/RefExtensions.kt @@ -1,5 +1,6 @@ package app.extensions +import org.eclipse.jgit.lib.Constants import org.eclipse.jgit.lib.ObjectIdRef import org.eclipse.jgit.lib.Ref @@ -8,22 +9,34 @@ private const val LOCAL_PREFIX_LENGTH = 2 val Ref.simpleName: String get() { - return if (this.isRemote) { - val split = name.split("/") - split.takeLast(split.size - REMOTE_PREFIX_LENGTH).joinToString("/") - } else { - val split = this.name.split("/") - split.takeLast(split.size - LOCAL_PREFIX_LENGTH).joinToString("/") + return when { + this.name == Constants.HEAD -> { + this.name + } + this.isRemote -> { + val split = name.split("/") + split.takeLast(split.size - REMOTE_PREFIX_LENGTH).joinToString("/") + } + else -> { + val split = this.name.split("/") + split.takeLast(split.size - LOCAL_PREFIX_LENGTH).joinToString("/") + } } } val Ref.simpleVisibleName: String get() { - return if (this.isRemote) { - name.replace("refs/remotes/", "") - } else { - val split = this.name.split("/") - split.takeLast(split.size - LOCAL_PREFIX_LENGTH).joinToString("/") + return when { + this.name == Constants.HEAD -> { + this.name + } + this.isRemote -> { + name.replace("refs/remotes/", "") + } + else -> { + val split = this.name.split("/") + split.takeLast(split.size - LOCAL_PREFIX_LENGTH).joinToString("/") + } } }