fixup! Make fixup helper ignore other fixup commits when trying to find base commit

Author: mricherzhagen

pkg/gui/controllers/helpers/fixup_helper.go

@@ -128,9 +128,20 @@ func (self *FixupHelper) HandleFindBaseCommitForFixupPress() error {
 			return fmt.Errorf("%s\n\n%s", message, subjects)
 		}
 		// There is only a single non fixup commit found. Present it with a Confirmation dialog.
-		_, index, _ := self.findCommit(commits, non_fixup_commits[0].Hash())
+		found_commit := non_fixup_commits[0]
+		all_fixup_for_found_commit := lo.EveryBy(unmerged_commits, func(c *models.Commit) bool {
+			if c == found_commit {
+				return true
+			}
+			fixup_subject := c.Name
+			fixup_subject = strings.TrimPrefix(fixup_subject, "fixup! ")
+			fixup_subject = strings.TrimPrefix(fixup_subject, "squash! ")
+			fixup_subject = strings.TrimPrefix(fixup_subject, "amend! ")
+			return strings.HasPrefix(found_commit.Name, fixup_subject)
+		})
+		_, index, _ := self.findCommit(commits, found_commit.Hash())
 
-		return self.c.ConfirmIf(true, types.ConfirmOpts{
+		return self.c.ConfirmIf(!all_fixup_for_found_commit, types.ConfirmOpts{
 			Title:         self.c.Tr.FindBaseCommitForFixup,
 			Prompt:        fmt.Sprintf("%s\n\n%s", self.c.Tr.MultipleBaseCommitsOnlyOneNonFixup, subjects),
 			HandleConfirm: self.getHandlerToStageAndSelectIndex(hasStagedChanges, index),

pkg/integration/tests/commit/find_base_commit_for_fixup_ignore_fixup_commits.go

@@ -36,15 +36,6 @@ var FindBaseCommitForFixupIgnoreFixupCommits = NewIntegrationTest(NewIntegration
 		t.Views().Files().
 			Focus().
 			Press(keys.Files.FindBaseCommitForFixup)
-		t.ExpectPopup().
-			Confirmation().
-			Title(Equals("Find base commit for fixup")).
-			Content(
-				Contains("all but one of them were fixup commits").
-					Contains("3rd commit").
-					Contains("fixup! 3rd commit"),
-			).
-			Confirm()
 		t.Views().Commits().
 			IsFocused().
 			Lines(

pkg/integration/tests/commit/find_base_commit_for_fixup_ignore_fixup_commits_warn_for_other.go

@@ -0,0 +1,58 @@
+package commit
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var FindBaseCommitForFixupIgnoreFixupCommitsWarnForOther = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Finds the base commit to create a fixup for, disregarding changes to a commit that is already on master",
+	ExtraCmdArgs: []string{},
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shell.
+			EmptyCommit("1st commit").
+			CreateFileAndAdd("file", "file1 content line 1\nfile1 content line 2\n").
+			Commit("2nd commit").
+			NewBranch("mybranch").
+			UpdateFileAndAdd("file", "file1 changed content line 1\nfile1 changed content line 2\n").
+			Commit("3rd commit").
+			EmptyCommit("4th commit").
+			UpdateFileAndAdd("file", "file1 1st fixup content line 1\nfile1 changed content line 2\n").
+			Commit("fixup! some other commit").
+			UpdateFile("file", "file1 2nd fixup content line 1\nfile1 2nd fixup content line 2\n")
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Commits().
+			Lines(
+				Contains("fixup! some other commit").IsSelected(),
+				Contains("4th commit"),
+				Contains("3rd commit"),
+				Contains("2nd commit"),
+				Contains("1st commit"),
+			)
+
+		t.Views().Files().
+			Focus().
+			Press(keys.Files.FindBaseCommitForFixup)
+		t.ExpectPopup().
+			Confirmation().
+			Title(Equals("Find base commit for fixup")).
+			Content(
+				Contains("all but one of them were fixup commits").
+					Contains("3rd commit").
+					Contains("fixup! some other commit"),
+			).
+			Confirm()
+		t.Views().Commits().
+			IsFocused().
+			Lines(
+				Contains("fixup! some other commit"),
+				Contains("4th commit"),
+				Contains("3rd commit").IsSelected(),
+				Contains("2nd commit"),
+				Contains("1st commit"),
+			)
+	},
+})

pkg/integration/tests/test_list.go

@@ -132,6 +132,7 @@ var tests = []*components.IntegrationTest{
 	commit.FindBaseCommitForFixup,
 	commit.FindBaseCommitForFixupDisregardMainBranch,
 	commit.FindBaseCommitForFixupIgnoreFixupCommits,
+	commit.FindBaseCommitForFixupIgnoreFixupCommitsWarnForOther,
 	commit.FindBaseCommitForFixupOnlyAddedLines,
 	commit.FindBaseCommitForFixupWarningForAddedLines,
 	commit.Highlight,