From 61815c10e7e901d31274706040c5c7598dcd0eca Mon Sep 17 00:00:00 2001
From: Stefan Haller <stefan@haller-berlin.de>
Date: Fri, 27 Jun 2025 14:13:31 +0200
Subject: [PATCH] Add a test showing undesired branch icon at head commit

The icon will appear when there's a tag with the same name as the current branch
(that's what we're testing here), or even when there's a remote with the same
name. I'm not adding a test for this latter case, but this was actually how I
discovered the issue.
---
 ..._not_show_branch_marker_for_head_commit.go | 34 +++++++++++++++++++
 pkg/integration/tests/test_list.go            |  1 +
 2 files changed, 35 insertions(+)
 create mode 100644 pkg/integration/tests/commit/do_not_show_branch_marker_for_head_commit.go

diff --git a/pkg/integration/tests/commit/do_not_show_branch_marker_for_head_commit.go b/pkg/integration/tests/commit/do_not_show_branch_marker_for_head_commit.go
new file mode 100644
index 000000000..70b1cb22e
--- /dev/null
+++ b/pkg/integration/tests/commit/do_not_show_branch_marker_for_head_commit.go
@@ -0,0 +1,34 @@
+package commit
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var DoNotShowBranchMarkerForHeadCommit = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Verify that no branch heads are shown for the branch head if there is a tag with the same name as the branch",
+	ExtraCmdArgs: []string{},
+	Skip:         false,
+	GitVersion:   AtLeast("2.38.0"),
+	SetupConfig: func(config *config.AppConfig) {
+		config.GetAppState().GitLogShowGraph = "never"
+	},
+	SetupRepo: func(shell *Shell) {
+		shell.EmptyCommit("one")
+		shell.NewBranch("branch1")
+		shell.EmptyCommit("two")
+		shell.EmptyCommit("three")
+		shell.CreateLightweightTag("branch1", "master")
+
+		shell.SetConfig("rebase.updateRefs", "true")
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		// Check that the local commits view does show a branch marker for the head commit
+		t.Views().Commits().
+			Lines(
+				Contains("CI * three"), // don't want the star here
+				Contains("CI two"),
+				Contains("CI branch1 one"),
+			)
+	},
+})
diff --git a/pkg/integration/tests/test_list.go b/pkg/integration/tests/test_list.go
index ef26f0223..e1dd36dbf 100644
--- a/pkg/integration/tests/test_list.go
+++ b/pkg/integration/tests/test_list.go
@@ -118,6 +118,7 @@ var tests = []*components.IntegrationTest{
 	commit.CreateTag,
 	commit.DisableCopyCommitMessageBody,
 	commit.DiscardOldFileChanges,
+	commit.DoNotShowBranchMarkerForHeadCommit,
 	commit.FailHooksThenCommitNoHooks,
 	commit.FindBaseCommitForFixup,
 	commit.FindBaseCommitForFixupDisregardMainBranch,