Merge pull request #2164 from mark2185/fix-rebasing-over-merge-commits

Author: jesseduffield

pkg/commands/git_commands/rebase.go

@@ -255,7 +255,7 @@ func (self *RebaseCommands) SquashAllAboveFixupCommits(sha string) error {
 	return self.runSkipEditorCommand(
 		self.cmd.New(
 			fmt.Sprintf(
-				"git rebase --interactive --autostash --autosquash %s^",
+				"git rebase --interactive --rebase-merges --autostash --autosquash %s^",
 				sha,
 			),
 		),

pkg/integration/components/input.go

@@ -76,6 +76,12 @@ func (self *Input) Confirm() {
 	self.pressKey(self.keys.Universal.Confirm)
 }
 
+func (self *Input) ProceedWhenAsked(matcher *matcher) {
+	self.assert.InConfirm()
+	self.assert.MatchCurrentViewContent(matcher)
+	self.Confirm()
+}
+
 // i.e. same as Confirm
 func (self *Input) Enter() {
 	self.pressKey(self.keys.Universal.Confirm)

pkg/integration/components/shell.go

@@ -63,6 +63,10 @@ func (s *Shell) Checkout(name string) *Shell {
 	return s.RunCommand("git checkout " + name)
 }
 
+func (s *Shell) Merge(name string) *Shell {
+	return s.RunCommand("git merge --commit --no-ff " + name)
+}
+
 func (s *Shell) GitAdd(path string) *Shell {
 	return s.RunCommand(fmt.Sprintf("git add \"%s\"", path))
 }

pkg/integration/tests/interactive_rebase/amend_merge.go

@@ -0,0 +1,50 @@
+package interactive_rebase
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var (
+	postMergeFileContent = "post merge file content"
+	postMergeFilename    = "post-merge-file"
+)
+
+var AmendMerge = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Amends a staged file to a merge commit.",
+	ExtraCmdArgs: "",
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shell.
+			NewBranch("development-branch").
+			CreateFileAndAdd("initial-file", "initial file content").
+			Commit("initial commit").
+			NewBranch("feature-branch"). // it's also checked out automatically
+			CreateFileAndAdd("new-feature-file", "new content").
+			Commit("new feature commit").
+			Checkout("development-branch").
+			Merge("feature-branch").
+			CreateFileAndAdd(postMergeFilename, postMergeFileContent)
+	},
+	Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) {
+		assert.CommitCount(3)
+
+		input.SwitchToCommitsWindow()
+		assert.CurrentViewName("commits")
+
+		mergeCommitMessage := "Merge branch 'feature-branch' into development-branch"
+		assert.MatchHeadCommitMessage(Contains(mergeCommitMessage))
+
+		input.PressKeys(keys.Commits.AmendToCommit)
+		input.ProceedWhenAsked(Contains("Are you sure you want to amend this commit with your staged files?"))
+
+		// assuring we haven't added a brand new commit
+		assert.CommitCount(3)
+		assert.MatchHeadCommitMessage(Contains(mergeCommitMessage))
+
+		// assuring the post-merge file shows up in the merge commit.
+		assert.MatchMainViewContent(Contains(postMergeFilename))
+		assert.MatchMainViewContent(Contains("++" + postMergeFileContent))
+	},
+})

pkg/integration/tests/tests.go

@@ -29,6 +29,7 @@ var tests = []*components.IntegrationTest{
 	branch.Rebase,
 	branch.RebaseAndDrop,
 	interactive_rebase.One,
+	interactive_rebase.AmendMerge,
 	custom_commands.Basic,
 	custom_commands.MultiplePrompts,
 	custom_commands.MenuFromCommand,

test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/COMMIT_EDITMSG

@@ -0,0 +1 @@
+fixup! Merge branch 'feature-branch' into development-branch

test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/FETCH_HEAD

@@ -0,0 +1 @@
+ref: refs/heads/development-branch

test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/HEAD

@@ -0,0 +1 @@
+7802c86c6ce62289e32aa13d0c85dc3f733195cb

test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/ORIG_HEAD

@@ -0,0 +1,12 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	ignorecase = true
+	precomposeunicode = true
+[user]
+	email = [email protected]
+	name = CI
+[commit]
+	gpgSign = false