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

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/HEAD

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

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

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

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

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

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

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/info/exclude

@@ -0,0 +1,7 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
+.DS_Store

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

@@ -0,0 +1,12 @@
+0000000000000000000000000000000000000000 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI <CI@example.com> 1663440492 -0700	commit (initial): initial commit
+3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI <CI@example.com> 1663440492 -0700	checkout: moving from development-branch to feature-branch
+3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 d1c7801838f293fe8f4b49dae6b4919d0359e6e6 CI <CI@example.com> 1663440492 -0700	commit: new feature commit
+d1c7801838f293fe8f4b49dae6b4919d0359e6e6 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI <CI@example.com> 1663440492 -0700	checkout: moving from feature-branch to development-branch
+3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 CI <CI@example.com> 1663440492 -0700	merge feature-branch: Merge made by the 'recursive' strategy.
+f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 7802c86c6ce62289e32aa13d0c85dc3f733195cb CI <CI@example.com> 1663440493 -0700	commit: fixup! Merge branch 'feature-branch' into development-branch
+7802c86c6ce62289e32aa13d0c85dc3f733195cb 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI <CI@example.com> 1663440494 -0700	rebase (start): checkout f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15^
+3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 d1c7801838f293fe8f4b49dae6b4919d0359e6e6 CI <CI@example.com> 1663440494 -0700	rebase: fast-forward
+d1c7801838f293fe8f4b49dae6b4919d0359e6e6 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI <CI@example.com> 1663440494 -0700	rebase (reset): 'onto'
+3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 CI <CI@example.com> 1663440494 -0700	rebase: fast-forward
+f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 f517de66e2a158d4a1d85246611cae9ca23a938d CI <CI@example.com> 1663440494 -0700	rebase (fixup): Merge branch 'feature-branch' into development-branch
+f517de66e2a158d4a1d85246611cae9ca23a938d f517de66e2a158d4a1d85246611cae9ca23a938d CI <CI@example.com> 1663440494 -0700	rebase (finish): returning to refs/heads/development-branch

test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/development-branch

@@ -0,0 +1,4 @@
+0000000000000000000000000000000000000000 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI <CI@example.com> 1663440492 -0700	commit (initial): initial commit
+3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 CI <CI@example.com> 1663440492 -0700	merge feature-branch: Merge made by the 'recursive' strategy.
+f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 7802c86c6ce62289e32aa13d0c85dc3f733195cb CI <CI@example.com> 1663440493 -0700	commit: fixup! Merge branch 'feature-branch' into development-branch
+7802c86c6ce62289e32aa13d0c85dc3f733195cb f517de66e2a158d4a1d85246611cae9ca23a938d CI <CI@example.com> 1663440494 -0700	rebase (finish): refs/heads/development-branch onto 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3

test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/feature-branch

@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI <CI@example.com> 1663440492 -0700	branch: Created from HEAD
+3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 d1c7801838f293fe8f4b49dae6b4919d0359e6e6 CI <CI@example.com> 1663440492 -0700	commit: new feature commit

test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/78/02c86c6ce62289e32aa13d0c85dc3f733195cb

@@ -0,0 +1,2 @@
+x
��Mj�0F��)���R$��J �,z��x�1D�r��kh���޷xTK�;.~��֍ݠ%k!�"�iF�y��h�f���j��K	�|v����
�`1O1� �Q�|6^��o���
+����O,띿��o0!X��-u�Z����ͻ���������!7\�a�[��?`^z��|�k��_B�
��N�

test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/f5/17de66e2a158d4a1d85246611cae9ca23a938d

@@ -0,0 +1,2 @@
+x
���jAD�Wt�Hf��9@�"��9�-�fwFƟ�˱���^����m�	�et�,Gx6J��R��g��9�Z��I��9`�R�2Ȧ�YBfT�Q��XCe��b��{���?������1�
+�p�X�:Ve�7�Ǹ���:�/��Nm�㵬퍴s�Yq4tT^�i_w��p~���'(���+i<:���@�e�T�������yL?2#Y|

test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/f6/8c5b48c653ca6ab23abd7606fe8fa8cc8d5b15

@@ -0,0 +1,2 @@
+x
���jC1DS߯�Ε�kiB�r����������C>?�����9�i�<����U!W�4&Gµ���)#5v���{����V�.b�}��*�ق		Z6
+��ǜ}��x�-���GS2��R4��Y\<�&MSy����|����M�ʼ�����+��"�Cptٹi_w���ħw�

test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/development-branch

@@ -0,0 +1 @@
+f517de66e2a158d4a1d85246611cae9ca23a938d

test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/feature-branch

@@ -0,0 +1 @@
+d1c7801838f293fe8f4b49dae6b4919d0359e6e6

test/integration_new/interactive_rebase/amend_merge/expected/repo/initial-file

@@ -0,0 +1 @@
+initial file content

test/integration_new/interactive_rebase/amend_merge/expected/repo/new-feature-file

@@ -0,0 +1 @@
+new content

test/integration_new/interactive_rebase/amend_merge/expected/repo/post-merge-file

@@ -0,0 +1 @@
+post merge file content