From 41f86f65353e2e73545103ebcf87d86e29d08a1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luka=20Marku=C5=A1i=C4=87?= Date: Sat, 10 Sep 2022 07:35:10 +0200 Subject: [PATCH 1/4] Rebase merges by default --- pkg/commands/git_commands/rebase.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/commands/git_commands/rebase.go b/pkg/commands/git_commands/rebase.go index 9a8f94618..11c187f36 100644 --- a/pkg/commands/git_commands/rebase.go +++ b/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, ), ), From 4c7d363959287031453354f547a97a2658208c8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luka=20Marku=C5=A1i=C4=87?= Date: Sat, 10 Sep 2022 17:00:19 +0200 Subject: [PATCH 2/4] Add CheckoutBranch and Merge helpers for integration tests --- pkg/integration/components/shell.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/integration/components/shell.go b/pkg/integration/components/shell.go index 458528be7..6595b1e87 100644 --- a/pkg/integration/components/shell.go +++ b/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 " + name) +} + func (s *Shell) GitAdd(path string) *Shell { return s.RunCommand(fmt.Sprintf("git add \"%s\"", path)) } From 0141bbde0e774de29c0e73e54d23c2c211f59cce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luka=20Marku=C5=A1i=C4=87?= Date: Sat, 10 Sep 2022 17:00:40 +0200 Subject: [PATCH 3/4] Add test for amending a merge commit --- pkg/integration/components/shell.go | 2 +- .../tests/interactive_rebase/amend_merge.go | 37 ++++++++++++++++++ pkg/integration/tests/tests.go | 1 + .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 + .../expected/repo/.git_keep/FETCH_HEAD | 0 .../amend_merge/expected/repo/.git_keep/HEAD | 1 + .../expected/repo/.git_keep/ORIG_HEAD | 1 + .../expected/repo/.git_keep/config | 10 +++++ .../expected/repo/.git_keep/description | 1 + .../amend_merge/expected/repo/.git_keep/index | Bin 0 -> 286 bytes .../expected/repo/.git_keep/info/exclude | 6 +++ .../expected/repo/.git_keep/logs/HEAD | 5 +++ .../logs/refs/heads/development-branch | 2 + .../.git_keep/logs/refs/heads/feature-branch | 2 + .../30/2ccf67433ac0eae0af16e7ad84e0fca8690f2d | Bin 0 -> 93 bytes .../47/d2739ba2c34690248c8f91b84bb54e8936899a | Bin 0 -> 27 bytes .../48/9361eca1233745c15acc9381322e97b4d44b57 | Bin 0 -> 57 bytes .../5e/62a9dc2e1352e7ee6ecf17033e2ed3382efc6f | 2 + .../6b/584e8ece562ebffc15d38808cd6b98fc3d97ea | Bin 0 -> 22 bytes .../77/e1bb1effc5857c4d701219a001823432e3586d | 1 + .../a6/9464e3729a09e3a526d4a2db209ee43e64ba1c | 2 + .../.git_keep/refs/heads/development-branch | 1 + .../repo/.git_keep/refs/heads/feature-branch | 1 + .../amend_merge/expected/repo/initial-file | 1 + .../expected/repo/new-feature-file | 1 + .../amend_merge/expected/repo/post-merge-file | 1 + 26 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 pkg/integration/tests/interactive_rebase/amend_merge.go create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/COMMIT_EDITMSG create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/FETCH_HEAD create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/HEAD create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/ORIG_HEAD create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/config create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/description create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/index create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/info/exclude create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/HEAD create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/development-branch create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/feature-branch create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/30/2ccf67433ac0eae0af16e7ad84e0fca8690f2d create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/47/d2739ba2c34690248c8f91b84bb54e8936899a create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/48/9361eca1233745c15acc9381322e97b4d44b57 create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/5e/62a9dc2e1352e7ee6ecf17033e2ed3382efc6f create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/6b/584e8ece562ebffc15d38808cd6b98fc3d97ea create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/77/e1bb1effc5857c4d701219a001823432e3586d create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/a6/9464e3729a09e3a526d4a2db209ee43e64ba1c create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/development-branch create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/feature-branch create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/initial-file create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/new-feature-file create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/post-merge-file diff --git a/pkg/integration/components/shell.go b/pkg/integration/components/shell.go index 6595b1e87..5f7fef350 100644 --- a/pkg/integration/components/shell.go +++ b/pkg/integration/components/shell.go @@ -64,7 +64,7 @@ func (s *Shell) Checkout(name string) *Shell { } func (s *Shell) Merge(name string) *Shell { - return s.RunCommand("git merge --commit " + name) + return s.RunCommand("git merge --commit --no-ff " + name) } func (s *Shell) GitAdd(path string) *Shell { diff --git a/pkg/integration/tests/interactive_rebase/amend_merge.go b/pkg/integration/tests/interactive_rebase/amend_merge.go new file mode 100644 index 000000000..d1b295cff --- /dev/null +++ b/pkg/integration/tests/interactive_rebase/amend_merge.go @@ -0,0 +1,37 @@ +package interactive_rebase + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +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", "content"). + Commit("initial commit"). + NewBranch("feature-branch"). // it's also checked out automatically + CreateFileAndAdd("new-feature-file", "new content"). + Commit("new feature commit"). + CheckoutBranch("development-branch"). + Merge("feature-branch"). + CreateFileAndAdd("post-merge-file", "content") + }, + Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) { + assert.CommitCount(3) + + input.SwitchToCommitsWindow() + assert.CurrentViewName("commits") + + input.PressKeys(keys.Commits.AmendToCommit) + input.PressKeys(keys.Universal.Return) + + assert.MatchHeadCommitMessage(Contains("Merge")) + assert.CommitCount(3) + }, +}) diff --git a/pkg/integration/tests/tests.go b/pkg/integration/tests/tests.go index eb2fd83fa..d59177c7e 100644 --- a/pkg/integration/tests/tests.go +++ b/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, diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..857a5998b --- /dev/null +++ b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +new feature commit diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/FETCH_HEAD b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/HEAD b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/HEAD new file mode 100644 index 000000000..dbe0904e2 --- /dev/null +++ b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/development-branch diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/ORIG_HEAD b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..6b03146bc --- /dev/null +++ b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +a69464e3729a09e3a526d4a2db209ee43e64ba1c diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/config b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/config new file mode 100644 index 000000000..8a266ea88 --- /dev/null +++ b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/config @@ -0,0 +1,10 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true +[user] + email = CI@example.com + name = CI +[commit] + gpgSign = false diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/description b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/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. diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/index b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..02e2692f47fedb6a6fb436d06aa938672bb4929f GIT binary patch literal 286 zcmZ?q402{*U|<4b=46@G&l&#zE``xRF)7C7@9P*C8kYd2UqCPedv=6h-?=co{eMI+ zcW|7|p7F_vy& zCaCoEPu$_X)vwd6a~6X@UTV2+T54iRX;CWFOt3lA9&UosQ1jNKnTOqd`~~^NCAzt( sMd>i(7(#+vU4dq>G3Xj97;rTo(myx-@JYEseYd~6mq>n!4^GJj0JzX)?*IS* literal 0 HcmV?d00001 diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/info/exclude b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/info/exclude new file mode 100644 index 000000000..a5196d1be --- /dev/null +++ b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/info/exclude @@ -0,0 +1,6 @@ +# 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] +# *~ diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/HEAD b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..8f516843a --- /dev/null +++ b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 a69464e3729a09e3a526d4a2db209ee43e64ba1c CI 1662823399 +0200 commit (initial): initial commit +a69464e3729a09e3a526d4a2db209ee43e64ba1c a69464e3729a09e3a526d4a2db209ee43e64ba1c CI 1662823399 +0200 checkout: moving from development-branch to feature-branch +a69464e3729a09e3a526d4a2db209ee43e64ba1c 5e62a9dc2e1352e7ee6ecf17033e2ed3382efc6f CI 1662823399 +0200 commit: new feature commit +5e62a9dc2e1352e7ee6ecf17033e2ed3382efc6f a69464e3729a09e3a526d4a2db209ee43e64ba1c CI 1662823399 +0200 checkout: moving from feature-branch to development-branch +a69464e3729a09e3a526d4a2db209ee43e64ba1c 77e1bb1effc5857c4d701219a001823432e3586d CI 1662823399 +0200 merge feature-branch: Merge made by the 'ort' strategy. diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/development-branch b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/development-branch new file mode 100644 index 000000000..e191d45d0 --- /dev/null +++ b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/development-branch @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 a69464e3729a09e3a526d4a2db209ee43e64ba1c CI 1662823399 +0200 commit (initial): initial commit +a69464e3729a09e3a526d4a2db209ee43e64ba1c 77e1bb1effc5857c4d701219a001823432e3586d CI 1662823399 +0200 merge feature-branch: Merge made by the 'ort' strategy. diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/feature-branch b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/feature-branch new file mode 100644 index 000000000..0825e687b --- /dev/null +++ b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/feature-branch @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 a69464e3729a09e3a526d4a2db209ee43e64ba1c CI 1662823399 +0200 branch: Created from HEAD +a69464e3729a09e3a526d4a2db209ee43e64ba1c 5e62a9dc2e1352e7ee6ecf17033e2ed3382efc6f CI 1662823399 +0200 commit: new feature commit diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/30/2ccf67433ac0eae0af16e7ad84e0fca8690f2d b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/30/2ccf67433ac0eae0af16e7ad84e0fca8690f2d new file mode 100644 index 0000000000000000000000000000000000000000..3b87e38964f0ee0bef41a17b53341dcc85ff690d GIT binary patch literal 93 zcmV-j0HXhR0V^p=O;xZkVK6i>Ff%bx$jr+u$xO`AP0P$lWyp^3>pK^wxBrjmQR{xGc=n>hZWB~``X}!2-s;zB);S9R8;m51B-k!= literal 0 HcmV?d00001 diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/47/d2739ba2c34690248c8f91b84bb54e8936899a b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/47/d2739ba2c34690248c8f91b84bb54e8936899a new file mode 100644 index 0000000000000000000000000000000000000000..c416a87e05b83ccdacb2040539807f0853995be9 GIT binary patch literal 27 icmb4U@$Z=Ff%bx$jr+u$xO`AP0P$lWyp^3>pK^wxBrjm \ No newline at end of file diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/6b/584e8ece562ebffc15d38808cd6b98fc3d97ea b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/6b/584e8ece562ebffc15d38808cd6b98fc3d97ea new file mode 100644 index 0000000000000000000000000000000000000000..ec9764eae7ae13711d9505390685b84b0bafd229 GIT binary patch literal 22 dcmb/9s7q&<%jtL. ~. \ No newline at end of file diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/development-branch b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/development-branch new file mode 100644 index 000000000..e51ee7bdf --- /dev/null +++ b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/development-branch @@ -0,0 +1 @@ +77e1bb1effc5857c4d701219a001823432e3586d diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/feature-branch b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/feature-branch new file mode 100644 index 000000000..e80dfebb2 --- /dev/null +++ b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/feature-branch @@ -0,0 +1 @@ +5e62a9dc2e1352e7ee6ecf17033e2ed3382efc6f diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/initial-file b/test/integration_new/interactive_rebase/amend_merge/expected/repo/initial-file new file mode 100644 index 000000000..6b584e8ec --- /dev/null +++ b/test/integration_new/interactive_rebase/amend_merge/expected/repo/initial-file @@ -0,0 +1 @@ +content \ No newline at end of file diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/new-feature-file b/test/integration_new/interactive_rebase/amend_merge/expected/repo/new-feature-file new file mode 100644 index 000000000..47d2739ba --- /dev/null +++ b/test/integration_new/interactive_rebase/amend_merge/expected/repo/new-feature-file @@ -0,0 +1 @@ +new content \ No newline at end of file diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/post-merge-file b/test/integration_new/interactive_rebase/amend_merge/expected/repo/post-merge-file new file mode 100644 index 000000000..6b584e8ec --- /dev/null +++ b/test/integration_new/interactive_rebase/amend_merge/expected/repo/post-merge-file @@ -0,0 +1 @@ +content \ No newline at end of file From 23d39c79b2ea59ef061906c5f0735efbaf9033ef Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sat, 17 Sep 2022 11:58:24 -0700 Subject: [PATCH 4/4] update test --- pkg/integration/components/input.go | 6 +++++ .../tests/interactive_rebase/amend_merge.go | 25 +++++++++++++----- .../expected/repo/.git_keep/COMMIT_EDITMSG | 2 +- .../expected/repo/.git_keep/ORIG_HEAD | 2 +- .../expected/repo/.git_keep/config | 2 ++ .../amend_merge/expected/repo/.git_keep/index | Bin 286 -> 305 bytes .../expected/repo/.git_keep/info/exclude | 1 + .../expected/repo/.git_keep/logs/HEAD | 17 ++++++++---- .../logs/refs/heads/development-branch | 6 +++-- .../.git_keep/logs/refs/heads/feature-branch | 4 +-- .../30/2ccf67433ac0eae0af16e7ad84e0fca8690f2d | Bin 93 -> 0 bytes .../34/9e7420fb0fcc3ff740eae5b9dc103a1261558e | Bin 0 -> 128 bytes .../3a/d14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 | Bin 0 -> 123 bytes .../3f/891fb57220f67735a13cb5a65d27c8ad388030 | Bin 0 -> 57 bytes .../48/9361eca1233745c15acc9381322e97b4d44b57 | Bin 57 -> 0 bytes .../5e/62a9dc2e1352e7ee6ecf17033e2ed3382efc6f | 2 -- .../63/e06ef6d5baa80461d12e953ee7e75444180d8f | Bin 0 -> 39 bytes .../6b/584e8ece562ebffc15d38808cd6b98fc3d97ea | Bin 22 -> 0 bytes .../77/e1bb1effc5857c4d701219a001823432e3586d | 1 - .../78/02c86c6ce62289e32aa13d0c85dc3f733195cb | 2 ++ .../7a/02580e6e6ba96ea8fb9c7ebad7d03d00ec0643 | Bin 0 -> 36 bytes .../7b/d422e3608d9bcfeef85748c90a5ec114fc2c17 | Bin 0 -> 93 bytes .../a6/9464e3729a09e3a526d4a2db209ee43e64ba1c | 2 -- .../d1/c7801838f293fe8f4b49dae6b4919d0359e6e6 | Bin 0 -> 154 bytes .../f5/17de66e2a158d4a1d85246611cae9ca23a938d | 2 ++ .../f6/8c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 | 2 ++ .../.git_keep/refs/heads/development-branch | 2 +- .../repo/.git_keep/refs/heads/feature-branch | 2 +- .../amend_merge/expected/repo/initial-file | 2 +- .../amend_merge/expected/repo/post-merge-file | 2 +- 30 files changed, 58 insertions(+), 26 deletions(-) delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/30/2ccf67433ac0eae0af16e7ad84e0fca8690f2d create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/34/9e7420fb0fcc3ff740eae5b9dc103a1261558e create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/3a/d14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/3f/891fb57220f67735a13cb5a65d27c8ad388030 delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/48/9361eca1233745c15acc9381322e97b4d44b57 delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/5e/62a9dc2e1352e7ee6ecf17033e2ed3382efc6f create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/63/e06ef6d5baa80461d12e953ee7e75444180d8f delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/6b/584e8ece562ebffc15d38808cd6b98fc3d97ea delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/77/e1bb1effc5857c4d701219a001823432e3586d create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/78/02c86c6ce62289e32aa13d0c85dc3f733195cb create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/7a/02580e6e6ba96ea8fb9c7ebad7d03d00ec0643 create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/7b/d422e3608d9bcfeef85748c90a5ec114fc2c17 delete mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/a6/9464e3729a09e3a526d4a2db209ee43e64ba1c create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/d1/c7801838f293fe8f4b49dae6b4919d0359e6e6 create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/f5/17de66e2a158d4a1d85246611cae9ca23a938d create mode 100644 test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/f6/8c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 diff --git a/pkg/integration/components/input.go b/pkg/integration/components/input.go index 61c78e9eb..61b0f771f 100644 --- a/pkg/integration/components/input.go +++ b/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) diff --git a/pkg/integration/tests/interactive_rebase/amend_merge.go b/pkg/integration/tests/interactive_rebase/amend_merge.go index d1b295cff..e01e79a78 100644 --- a/pkg/integration/tests/interactive_rebase/amend_merge.go +++ b/pkg/integration/tests/interactive_rebase/amend_merge.go @@ -5,6 +5,11 @@ import ( . "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: "", @@ -13,14 +18,14 @@ var AmendMerge = NewIntegrationTest(NewIntegrationTestArgs{ SetupRepo: func(shell *Shell) { shell. NewBranch("development-branch"). - CreateFileAndAdd("initial-file", "content"). + 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"). - CheckoutBranch("development-branch"). + Checkout("development-branch"). Merge("feature-branch"). - CreateFileAndAdd("post-merge-file", "content") + CreateFileAndAdd(postMergeFilename, postMergeFileContent) }, Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) { assert.CommitCount(3) @@ -28,10 +33,18 @@ var AmendMerge = NewIntegrationTest(NewIntegrationTestArgs{ input.SwitchToCommitsWindow() assert.CurrentViewName("commits") - input.PressKeys(keys.Commits.AmendToCommit) - input.PressKeys(keys.Universal.Return) + mergeCommitMessage := "Merge branch 'feature-branch' into development-branch" + assert.MatchHeadCommitMessage(Contains(mergeCommitMessage)) - assert.MatchHeadCommitMessage(Contains("Merge")) + 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)) }, }) diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/COMMIT_EDITMSG index 857a5998b..de6160af5 100644 --- a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/COMMIT_EDITMSG +++ b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/COMMIT_EDITMSG @@ -1 +1 @@ -new feature commit +fixup! Merge branch 'feature-branch' into development-branch diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/ORIG_HEAD b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/ORIG_HEAD index 6b03146bc..4829a07d0 100644 --- a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/ORIG_HEAD +++ b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/ORIG_HEAD @@ -1 +1 @@ -a69464e3729a09e3a526d4a2db209ee43e64ba1c +7802c86c6ce62289e32aa13d0c85dc3f733195cb diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/config b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/config index 8a266ea88..8a748ce32 100644 --- a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/config +++ b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/config @@ -3,6 +3,8 @@ filemode = true bare = false logallrefupdates = true + ignorecase = true + precomposeunicode = true [user] email = CI@example.com name = CI diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/index b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/index index 02e2692f47fedb6a6fb436d06aa938672bb4929f..01d1d03a330ea96f731b83814d0c29100ce2253c 100644 GIT binary patch literal 305 zcmZ?q402{*U|<4b=43Uo93|hXZWztTz`)8<;JTK9p>YWV1LIeq8W9k#Vv69)%U+qc z;`f}oUDq$zGQ44PX5h)p%Ph%E%+XED%t-~R0s^2pdCYDq0x%k4o|`|KdED-oif1o6 z>^4EAr+?xO@2!5FW}UMb1oBeLb<aGLY-hkGVd((S!b4*=k>Tu}f3 literal 286 zcmZ?q402{*U|<4b=46@G&l&#zE``xRF)7C7@9P*C8kYd2UqCPedv=6h-?=co{eMI+ zcW|7|p7F_vy& zCaCoEPu$_X)vwd6a~6X@UTV2+T54iRX;CWFOt3lA9&UosQ1jNKnTOqd`~~^NCAzt( sMd>i(7(#+vU4dq>G3Xj97;rTo(myx-@JYEseYd~6mq>n!4^GJj0JzX)?*IS* diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/info/exclude b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/info/exclude index a5196d1be..8e9f2071f 100644 --- a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/info/exclude +++ b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/info/exclude @@ -4,3 +4,4 @@ # exclude patterns (uncomment them if you want to use them): # *.[oa] # *~ +.DS_Store diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/HEAD b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/HEAD index 8f516843a..bf29df758 100644 --- a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/HEAD +++ b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/HEAD @@ -1,5 +1,12 @@ -0000000000000000000000000000000000000000 a69464e3729a09e3a526d4a2db209ee43e64ba1c CI 1662823399 +0200 commit (initial): initial commit -a69464e3729a09e3a526d4a2db209ee43e64ba1c a69464e3729a09e3a526d4a2db209ee43e64ba1c CI 1662823399 +0200 checkout: moving from development-branch to feature-branch -a69464e3729a09e3a526d4a2db209ee43e64ba1c 5e62a9dc2e1352e7ee6ecf17033e2ed3382efc6f CI 1662823399 +0200 commit: new feature commit -5e62a9dc2e1352e7ee6ecf17033e2ed3382efc6f a69464e3729a09e3a526d4a2db209ee43e64ba1c CI 1662823399 +0200 checkout: moving from feature-branch to development-branch -a69464e3729a09e3a526d4a2db209ee43e64ba1c 77e1bb1effc5857c4d701219a001823432e3586d CI 1662823399 +0200 merge feature-branch: Merge made by the 'ort' strategy. +0000000000000000000000000000000000000000 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI 1663440492 -0700 commit (initial): initial commit +3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI 1663440492 -0700 checkout: moving from development-branch to feature-branch +3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 d1c7801838f293fe8f4b49dae6b4919d0359e6e6 CI 1663440492 -0700 commit: new feature commit +d1c7801838f293fe8f4b49dae6b4919d0359e6e6 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI 1663440492 -0700 checkout: moving from feature-branch to development-branch +3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 CI 1663440492 -0700 merge feature-branch: Merge made by the 'recursive' strategy. +f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 7802c86c6ce62289e32aa13d0c85dc3f733195cb CI 1663440493 -0700 commit: fixup! Merge branch 'feature-branch' into development-branch +7802c86c6ce62289e32aa13d0c85dc3f733195cb 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI 1663440494 -0700 rebase (start): checkout f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15^ +3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 d1c7801838f293fe8f4b49dae6b4919d0359e6e6 CI 1663440494 -0700 rebase: fast-forward +d1c7801838f293fe8f4b49dae6b4919d0359e6e6 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI 1663440494 -0700 rebase (reset): 'onto' +3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 CI 1663440494 -0700 rebase: fast-forward +f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 f517de66e2a158d4a1d85246611cae9ca23a938d CI 1663440494 -0700 rebase (fixup): Merge branch 'feature-branch' into development-branch +f517de66e2a158d4a1d85246611cae9ca23a938d f517de66e2a158d4a1d85246611cae9ca23a938d CI 1663440494 -0700 rebase (finish): returning to refs/heads/development-branch diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/development-branch b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/development-branch index e191d45d0..c7353e0e3 100644 --- a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/development-branch +++ b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/development-branch @@ -1,2 +1,4 @@ -0000000000000000000000000000000000000000 a69464e3729a09e3a526d4a2db209ee43e64ba1c CI 1662823399 +0200 commit (initial): initial commit -a69464e3729a09e3a526d4a2db209ee43e64ba1c 77e1bb1effc5857c4d701219a001823432e3586d CI 1662823399 +0200 merge feature-branch: Merge made by the 'ort' strategy. +0000000000000000000000000000000000000000 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI 1663440492 -0700 commit (initial): initial commit +3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 CI 1663440492 -0700 merge feature-branch: Merge made by the 'recursive' strategy. +f68c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 7802c86c6ce62289e32aa13d0c85dc3f733195cb CI 1663440493 -0700 commit: fixup! Merge branch 'feature-branch' into development-branch +7802c86c6ce62289e32aa13d0c85dc3f733195cb f517de66e2a158d4a1d85246611cae9ca23a938d CI 1663440494 -0700 rebase (finish): refs/heads/development-branch onto 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/feature-branch b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/feature-branch index 0825e687b..2d2177acc 100644 --- a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/feature-branch +++ b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/logs/refs/heads/feature-branch @@ -1,2 +1,2 @@ -0000000000000000000000000000000000000000 a69464e3729a09e3a526d4a2db209ee43e64ba1c CI 1662823399 +0200 branch: Created from HEAD -a69464e3729a09e3a526d4a2db209ee43e64ba1c 5e62a9dc2e1352e7ee6ecf17033e2ed3382efc6f CI 1662823399 +0200 commit: new feature commit +0000000000000000000000000000000000000000 3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 CI 1663440492 -0700 branch: Created from HEAD +3ad14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 d1c7801838f293fe8f4b49dae6b4919d0359e6e6 CI 1663440492 -0700 commit: new feature commit diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/30/2ccf67433ac0eae0af16e7ad84e0fca8690f2d b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/30/2ccf67433ac0eae0af16e7ad84e0fca8690f2d deleted file mode 100644 index 3b87e38964f0ee0bef41a17b53341dcc85ff690d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmV-j0HXhR0V^p=O;xZkVK6i>Ff%bx$jr+u$xO`AP0P$lWyp^3>pK^wxBrjmQR{xGc=n>hZWB~``X}!2-s;zB);S9R8;m51B-k!= diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/34/9e7420fb0fcc3ff740eae5b9dc103a1261558e b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/34/9e7420fb0fcc3ff740eae5b9dc103a1261558e new file mode 100644 index 0000000000000000000000000000000000000000..5f350fcff7689be1cedb988a54cbb6af10f32e89 GIT binary patch literal 128 zcmV-`0Du2@0V^p=O;s>7GG{O}FfcPQQOL~8EXhpF(M`+DNoA;Fir~x3UYWPz_nf+2 z*Du&IykT>Os>@3)*G)@JEGaEYg{XDER6KjpVYdk?J^d4RcyIOVH0zuNRa=l>T%wzs iT9gh|n*1Q|+tpnwSQ0PlO|^UeJj6wUw;upBfi$|t^*itY literal 0 HcmV?d00001 diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/3a/d14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/3a/d14f8b4ed479f2fd9d8d4f7fe2a9913771b7f3 new file mode 100644 index 0000000000000000000000000000000000000000..0ac8eaeca224797ad80ebd692f5aa059808274c2 GIT binary patch literal 123 zcmV->0EGW|0ga7Y3c@fD0R7G>_5#W#n^!@k(61h2n*_HH#HMP4aJBvky7XWwC(;Xch{KDfQNd`rDOKzmQt dq8$ueF(9gwo)gJ`>Z-n~RNmm%sV^6QF79mQIuQT> literal 0 HcmV?d00001 diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/3f/891fb57220f67735a13cb5a65d27c8ad388030 b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/3f/891fb57220f67735a13cb5a65d27c8ad388030 new file mode 100644 index 0000000000000000000000000000000000000000..057b302dc63b77dfa185ad0b0bbeda88f7ded413 GIT binary patch literal 57 zcmV-90LK4#0V^p=O;s>4U@$Z=Ff%bx$jr+u$xO`AP0P$lWvF6`;LFQinYZHioVs1t PFW54?VRHrmc8U?5wZ$4+ literal 0 HcmV?d00001 diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/48/9361eca1233745c15acc9381322e97b4d44b57 b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/48/9361eca1233745c15acc9381322e97b4d44b57 deleted file mode 100644 index 4ac136337e1d4823579eb6130bf93528e8016ad1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 57 zcmV-90LK4#0V^p=O;s>4U@$Z=Ff%bx$jr+u$xO`AP0P$lWyp^3>pK^wxBrjm \ No newline at end of file diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/63/e06ef6d5baa80461d12e953ee7e75444180d8f b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/63/e06ef6d5baa80461d12e953ee7e75444180d8f new file mode 100644 index 0000000000000000000000000000000000000000..21a235054c0b5ff6bb0d831eaa312997128fb477 GIT binary patch literal 39 vcmbB|T`&JokJD#7Lp{!&*Y-TC&B(AUit8HyEpHEA literal 0 HcmV?d00001 diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/6b/584e8ece562ebffc15d38808cd6b98fc3d97ea b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/6b/584e8ece562ebffc15d38808cd6b98fc3d97ea deleted file mode 100644 index ec9764eae7ae13711d9505390685b84b0bafd229..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22 dcmbFf%bx$jr+u$xO`AP0P$lWvF6`;LFQinYZHioVs1t zFW54?VRMG6%S$cSO-oHIDJ@EcsCBzoAu*>)p7;leAW literal 0 HcmV?d00001 diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/a6/9464e3729a09e3a526d4a2db209ee43e64ba1c b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/a6/9464e3729a09e3a526d4a2db209ee43e64ba1c deleted file mode 100644 index ae807eb94..000000000 --- a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/a6/9464e3729a09e3a526d4a2db209ee43e64ba1c +++ /dev/null @@ -1,2 +0,0 @@ -xK -0@]$]8`1D xxj-ѥ"`c" QeDIaOkWTW;`^>/9s7q&<%jtL. ~. \ No newline at end of file diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/d1/c7801838f293fe8f4b49dae6b4919d0359e6e6 b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/d1/c7801838f293fe8f4b49dae6b4919d0359e6e6 new file mode 100644 index 0000000000000000000000000000000000000000..abe014bbcd74657bfb18ee1fa5645b48d85895a0 GIT binary patch literal 154 zcmV;L0A>Gp0gaAZ3c@fD0R7G>_5w;C+in6PLce;9Ja$nqZ3!uQd<$N{-(dzOueClq zSUsG2V+KkEtz|cAUqZ^lEPf#LIp{cWHU=fzY)Eaf@zTM?av-0O3sMj(B@|y!NZ7^@ zj3Y9M#HqOV$J$_;;X2KC{=~Yy_>$Lp12c{eQDd-h)}*yM=rPs#PhBni2I1KE#_(&^ I7yqa~ae(kg&j0`b literal 0 HcmV?d00001 diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/f5/17de66e2a158d4a1d85246611cae9ca23a938d b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/f5/17de66e2a158d4a1d85246611cae9ca23a938d new file mode 100644 index 000000000..3d42ec640 --- /dev/null +++ b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/f5/17de66e2a158d4a1d85246611cae9ca23a938d @@ -0,0 +1,2 @@ +xjADWtHf9@"9-fwFƟ˱^m et,Gx6JRg9ZI9`R2ȦYBfTQXCeb{?1 +pX:Ve7Ǹ:/Nm㵬퍴sYq4tT^i_wp~'(+i<:@eTyL?2#Y| \ No newline at end of file diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/f6/8c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/f6/8c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 new file mode 100644 index 000000000..72c90791a --- /dev/null +++ b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/objects/f6/8c5b48c653ca6ab23abd7606fe8fa8cc8d5b15 @@ -0,0 +1,2 @@ +xjC1DS߯ΕkiBrC>?9i<U!W4&Gµ)#5v{V.b}*ق Z6 ǜ}x-GS2R4Y\<&MSy|Mʼ+"Cptٹi_wħw +]`ZƣඌD?n{Lr[Y \ No newline at end of file diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/development-branch b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/development-branch index e51ee7bdf..8dec112d4 100644 --- a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/development-branch +++ b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/development-branch @@ -1 +1 @@ -77e1bb1effc5857c4d701219a001823432e3586d +f517de66e2a158d4a1d85246611cae9ca23a938d diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/feature-branch b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/feature-branch index e80dfebb2..61eacdc31 100644 --- a/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/feature-branch +++ b/test/integration_new/interactive_rebase/amend_merge/expected/repo/.git_keep/refs/heads/feature-branch @@ -1 +1 @@ -5e62a9dc2e1352e7ee6ecf17033e2ed3382efc6f +d1c7801838f293fe8f4b49dae6b4919d0359e6e6 diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/initial-file b/test/integration_new/interactive_rebase/amend_merge/expected/repo/initial-file index 6b584e8ec..7a02580e6 100644 --- a/test/integration_new/interactive_rebase/amend_merge/expected/repo/initial-file +++ b/test/integration_new/interactive_rebase/amend_merge/expected/repo/initial-file @@ -1 +1 @@ -content \ No newline at end of file +initial file content \ No newline at end of file diff --git a/test/integration_new/interactive_rebase/amend_merge/expected/repo/post-merge-file b/test/integration_new/interactive_rebase/amend_merge/expected/repo/post-merge-file index 6b584e8ec..63e06ef6d 100644 --- a/test/integration_new/interactive_rebase/amend_merge/expected/repo/post-merge-file +++ b/test/integration_new/interactive_rebase/amend_merge/expected/repo/post-merge-file @@ -1 +1 @@ -content \ No newline at end of file +post merge file content \ No newline at end of file