From 6614d4d8f87dc74ccd9b1505636994fd9f83123c Mon Sep 17 00:00:00 2001
From: Stefan Haller <stefan@haller-berlin.de>
Date: Sat, 7 Nov 2026 09:46:25 +0100
Subject: [PATCH] Add a test for a cherry-pick that stops before it applies a
 commit

If a cherry-pick of several commits stops before git starts to apply
one of them, for example because the commit would overwrite an
untracked file, lazygit doesn't show the cherry-pick as in progress.
Git doesn't write CHERRY_PICK_HEAD in that case, and this is the only
thing we look at. The user has no way to continue or abort the
cherry-pick from lazygit, and the next cherry-pick fails with
"cherry-pick is already in progress".

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../cherry_pick_stopped_by_untracked_file.go  | 108 ++++++++++++++++++
 pkg/integration/tests/test_list.go            |   1 +
 2 files changed, 109 insertions(+)
 create mode 100644 pkg/integration/tests/cherry_pick/cherry_pick_stopped_by_untracked_file.go

diff --git a/pkg/integration/tests/cherry_pick/cherry_pick_stopped_by_untracked_file.go b/pkg/integration/tests/cherry_pick/cherry_pick_stopped_by_untracked_file.go
new file mode 100644
index 000000000..54e7dca0b
--- /dev/null
+++ b/pkg/integration/tests/cherry_pick/cherry_pick_stopped_by_untracked_file.go
@@ -0,0 +1,108 @@
+package cherry_pick
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var CherryPickStoppedByUntrackedFile = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Cherry pick two commits; an untracked file stops the second one before git starts to apply it; continue after removing the file",
+	ExtraCmdArgs: []string{},
+	Skip:         false,
+	SetupConfig: func(config *config.AppConfig) {
+		config.GetUserConfig().Git.LocalBranchSortOrder = "recency"
+	},
+	SetupRepo: func(shell *Shell) {
+		shell.
+			CreateFileAndAdd("file", "original\n").
+			Commit("base").
+			NewBranch("source").
+			CreateFileAndAdd("file1", "one\n").
+			Commit("one").
+			CreateFileAndAdd("file2", "two\n").
+			Commit("two").
+			Checkout("master").
+			CreateFile("file2", "untracked\n")
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Branches().
+			Focus().
+			Lines(
+				Contains("master"),
+				Contains("source"),
+			).
+			SelectNextItem().
+			PressEnter()
+
+		t.Views().SubCommits().
+			IsFocused().
+			Lines(
+				Contains("two").IsSelected(),
+				Contains("one"),
+				Contains("base"),
+			).
+			Press(keys.Commits.CherryPickCopy).
+			SelectNextItem().
+			Press(keys.Commits.CherryPickCopy)
+
+		t.Views().Information().Content(Contains("2 commits copied"))
+
+		t.Views().Commits().
+			Focus().
+			Lines(
+				Contains("base").IsSelected(),
+			).
+			Press(keys.Commits.PasteCommits).
+			Tap(func() {
+				t.ExpectPopup().Alert().
+					Title(Equals("Cherry-pick")).
+					Content(Contains("Are you sure you want to cherry-pick the 2 copied commit(s) onto this branch?")).
+					Confirm()
+			}).
+			Tap(func() {
+				t.ExpectPopup().Alert().
+					Title(Equals("Error")).
+					Content(Contains("The following untracked working tree files would be overwritten by merge")).
+					Confirm()
+			}).
+			/* EXPECTED:
+			Lines(
+				Contains("─── Pending cherry-picks"),
+				Contains("pick").DoesNotContain("CONFLICT").Contains("two"),
+				Contains("─── Commits"),
+				Contains("one"),
+				Contains("base"),
+			)
+			ACTUAL: */
+			Lines(
+				Contains("one"),
+				Contains("base"),
+			)
+
+		t.Views().Status().
+			/* EXPECTED:
+			Content(Equals("(cherry-picking) repo → master"))
+			ACTUAL: */
+			Content(Equals("repo → master"))
+
+		t.Shell().DeleteFile("file2")
+
+		t.GlobalPress(keys.Universal.CreateRebaseOptionsMenu)
+		/* EXPECTED:
+		t.ExpectPopup().Menu().
+			Title(Equals("Cherry-pick options")).
+			Select(Contains("continue")).
+			Confirm()
+
+		t.Views().Status().Content(Equals("repo → master"))
+
+		t.Views().Commits().
+			Lines(
+				Contains("two"),
+				Contains("one"),
+				Contains("base"),
+			)
+		ACTUAL: */
+		t.ExpectToast(Equals("Disabled: You are currently neither rebasing nor merging"))
+	},
+})
diff --git a/pkg/integration/tests/test_list.go b/pkg/integration/tests/test_list.go
index ddbfa63bc..6da04eae1 100644
--- a/pkg/integration/tests/test_list.go
+++ b/pkg/integration/tests/test_list.go
@@ -115,6 +115,7 @@ var tests = []*components.IntegrationTest{
 	cherry_pick.CherryPickMerge,
 	cherry_pick.CherryPickRange,
 	cherry_pick.CherryPickRangeAfterPaste,
+	cherry_pick.CherryPickStoppedByUntrackedFile,
 	commit.AddCoAuthor,
 	commit.AddCoAuthorRange,
 	commit.AddCoAuthorWhileCommitting,