From 5493451719d97c5e283d23795b6054b3dd5ace2e Mon Sep 17 00:00:00 2001
From: Abdelilah El Aissaoui <aeab13@gmail.com>
Date: Tue, 7 Dec 2021 00:02:49 +0100
Subject: [PATCH] Added current branch icon to detached HEAD

---
 src/main/kotlin/app/extensions/RefExtensions.kt |  3 +++
 src/main/kotlin/app/ui/log/Log.kt               | 12 ++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/kotlin/app/extensions/RefExtensions.kt b/src/main/kotlin/app/extensions/RefExtensions.kt
index 47bdd1a..5983b4a 100644
--- a/src/main/kotlin/app/extensions/RefExtensions.kt
+++ b/src/main/kotlin/app/extensions/RefExtensions.kt
@@ -27,6 +27,9 @@ val Ref.isRemote: Boolean
 
 
 fun Ref.isSameBranch(otherRef: Ref?): Boolean {
+    if(this.name == "HEAD" && otherRef == null)
+        return true
+
     if(otherRef == null)
         return false
 
diff --git a/src/main/kotlin/app/ui/log/Log.kt b/src/main/kotlin/app/ui/log/Log.kt
index a6789df..19b7a2b 100644
--- a/src/main/kotlin/app/ui/log/Log.kt
+++ b/src/main/kotlin/app/ui/log/Log.kt
@@ -159,7 +159,7 @@ fun LogDialogs(
     showLogDialog: LogDialog,
     currentBranch: Ref?,
 ) {
-    when(showLogDialog) {
+    when (showLogDialog) {
         is LogDialog.NewBranch -> {
             NewBranchDialog(
                 onReject = onResetShowLogDialog,
@@ -179,7 +179,7 @@ fun LogDialogs(
             )
         }
         is LogDialog.MergeBranch -> {
-            if(currentBranch != null)
+            if (currentBranch != null)
                 MergeDialog(
                     currentBranchName = currentBranch.simpleName,
                     mergeBranchName = showLogDialog.ref.simpleName,
@@ -438,10 +438,10 @@ fun CommitMessage(
                             isCurrentBranch = ref.isSameBranch(currentBranch),
                             onCheckoutBranch = { onCheckoutRef(ref) },
                             onMergeBranch = { onMergeBranch(ref) },
-                            onDeleteBranch = { onDeleteBranch(ref) }
+                            onDeleteBranch = { onDeleteBranch(ref) },
                         )
                     }
-            }
+                }
 
             Text(
                 text = commit.shortMessage,
@@ -646,7 +646,7 @@ fun BranchChip(
     }
 
     var endingContent: @Composable () -> Unit = {}
-    if(isCurrentBranch) {
+    if (isCurrentBranch) {
         endingContent = {
             Icon(
                 painter = painterResource("location.svg"),
@@ -682,7 +682,7 @@ fun TagChip(
                 onClick = onCheckoutTag
             )
         ).apply {
-            if(ref.isLocal) {
+            if (ref.isLocal) {
                 add(
                     ContextMenuItem(
                         label = "Delete tag",