diff --git a/pkg/integration/components/actions.go b/pkg/integration/components/actions.go index fb4114890..c599f3697 100644 --- a/pkg/integration/components/actions.go +++ b/pkg/integration/components/actions.go @@ -17,3 +17,17 @@ func (self *Actions) ContinueMerge() { func (self *Actions) ContinueRebase() { self.ContinueMerge() } + +func (self *Actions) AcknowledgeConflicts() { + self.t.ExpectPopup().Confirmation(). + Title(Equals("Auto-merge failed")). + Content(Contains("Conflicts!")). + Confirm() +} + +func (self *Actions) ContinueOnConflictsResolved() { + self.t.ExpectPopup().Confirmation(). + Title(Equals("continue")). + Content(Contains("all merge conflicts resolved. Continue?")). + Confirm() +} diff --git a/pkg/integration/tests/branch/rebase.go b/pkg/integration/tests/branch/rebase.go index e59aa8cb2..211dca839 100644 --- a/pkg/integration/tests/branch/rebase.go +++ b/pkg/integration/tests/branch/rebase.go @@ -35,10 +35,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{ Content(Contains("Are you sure you want to rebase 'first-change-branch' on top of 'second-change-branch'?")). Confirm() - t.ExpectPopup().Confirmation(). - Title(Equals("Auto-merge failed")). - Content(Contains("Conflicts!")). - Confirm() + t.Actions().AcknowledgeConflicts() t.Views().Files(). IsFocused(). @@ -51,10 +48,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Information().Content(Contains("rebasing")) - t.ExpectPopup().Confirmation(). - Title(Equals("continue")). - Content(Contains("all merge conflicts resolved. Continue?")). - Confirm() + t.Actions().ContinueOnConflictsResolved() t.Views().Information().Content(DoesNotContain("rebasing")) diff --git a/pkg/integration/tests/branch/rebase_and_drop.go b/pkg/integration/tests/branch/rebase_and_drop.go index 5f5341d66..04c2246ab 100644 --- a/pkg/integration/tests/branch/rebase_and_drop.go +++ b/pkg/integration/tests/branch/rebase_and_drop.go @@ -43,10 +43,7 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Information().Content(Contains("rebasing")) - t.ExpectPopup().Confirmation(). - Title(Equals("Auto-merge failed")). - Content(Contains("Conflicts!")). - Confirm() + t.Actions().AcknowledgeConflicts() t.Views().Files().IsFocused(). SelectedLine(MatchesRegexp("UU.*file")) @@ -78,10 +75,7 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{ IsFocused(). PressPrimaryAction() - t.ExpectPopup().Confirmation(). - Title(Equals("continue")). - Content(Contains("all merge conflicts resolved. Continue?")). - Confirm() + t.Actions().ContinueOnConflictsResolved() t.Views().Information().Content(DoesNotContain("rebasing")) diff --git a/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go index eaf9862d6..3e82de065 100644 --- a/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go +++ b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go @@ -52,10 +52,7 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{ Content(Contains("Are you sure you want to cherry-pick the copied commits onto this branch?")). Confirm() - t.ExpectPopup().Confirmation(). - Title(Equals("Auto-merge failed")). - Content(Contains("Conflicts!")). - Confirm() + t.Actions().AcknowledgeConflicts() t.Views().Files(). IsFocused(). @@ -68,10 +65,7 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{ SelectNextItem(). PressPrimaryAction() - t.ExpectPopup().Confirmation(). - Title(Equals("continue")). - Content(Contains("all merge conflicts resolved. Continue?")). - Confirm() + t.Actions().ContinueOnConflictsResolved() t.Views().Files().IsEmpty() diff --git a/pkg/integration/tests/file/discard_changes.go b/pkg/integration/tests/file/discard_changes.go index f3fc11a01..7a05f4466 100644 --- a/pkg/integration/tests/file/discard_changes.go +++ b/pkg/integration/tests/file/discard_changes.go @@ -99,10 +99,7 @@ var DiscardChanges = NewIntegrationTest(NewIntegrationTestArgs{ {status: "DU", label: "deleted-us.txt", menuTitle: "deleted-us.txt"}, }) - t.ExpectPopup().Confirmation(). - Title(Equals("continue")). - Content(Contains("all merge conflicts resolved. Continue?")). - Cancel() + t.Actions().ContinueOnConflictsResolved() discardOneByOne([]statusFile{ {status: "MD", label: "change-delete.txt", menuTitle: "change-delete.txt"}, diff --git a/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go b/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go index e177dd0cb..96b490a7f 100644 --- a/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go +++ b/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go @@ -49,21 +49,7 @@ var SwapInRebaseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{ }) func handleConflictsFromSwap(t *TestDriver) { - continueMerge := func() { - t.ExpectPopup().Confirmation(). - Title(Equals("continue")). - Content(Contains("all merge conflicts resolved. Continue?")). - Confirm() - } - - acceptConflicts := func() { - t.ExpectPopup().Confirmation(). - Title(Equals("Auto-merge failed")). - Content(Contains("Conflicts!")). - Confirm() - } - - acceptConflicts() + t.Actions().AcknowledgeConflicts() t.Views().Files(). IsFocused(). @@ -84,9 +70,9 @@ func handleConflictsFromSwap(t *TestDriver) { SelectNextItem(). PressPrimaryAction() // pick "three" - continueMerge() + t.Actions().ContinueOnConflictsResolved() - acceptConflicts() + t.Actions().AcknowledgeConflicts() t.Views().Files(). IsFocused(). @@ -107,7 +93,7 @@ func handleConflictsFromSwap(t *TestDriver) { SelectNextItem(). PressPrimaryAction() // pick "two" - continueMerge() + t.Actions().ContinueOnConflictsResolved() t.Views().Commits(). Focus(). diff --git a/pkg/integration/tests/sync/pull_merge.go b/pkg/integration/tests/sync/pull_merge.go new file mode 100644 index 000000000..86f828570 --- /dev/null +++ b/pkg/integration/tests/sync/pull_merge.go @@ -0,0 +1,53 @@ +package sync + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var PullMerge = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Pull with a merge strategy", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("file", "content1") + shell.Commit("one") + shell.UpdateFileAndAdd("file", "content2") + shell.Commit("two") + shell.EmptyCommit("three") + + shell.CloneIntoRemote("origin") + + shell.SetBranchUpstream("master", "origin/master") + + shell.HardReset("HEAD^^") + shell.EmptyCommit("four") + + shell.SetConfig("pull.rebase", "false") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Lines( + Contains("four"), + Contains("one"), + ) + + t.Views().Status().Content(Contains("↓2 repo → master")) + + t.Views().Files(). + IsFocused(). + Press(keys.Universal.Pull) + + t.Views().Status().Content(Contains("↑2 repo → master")) + + t.Views().Commits(). + Lines( + Contains("Merge branch 'master' of ../origin"), + Contains("three"), + Contains("two"), + Contains("four"), + Contains("one"), + ) + }, +}) diff --git a/pkg/integration/tests/sync/pull_merge_conflict.go b/pkg/integration/tests/sync/pull_merge_conflict.go new file mode 100644 index 000000000..447c11135 --- /dev/null +++ b/pkg/integration/tests/sync/pull_merge_conflict.go @@ -0,0 +1,84 @@ +package sync + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var PullMergeConflict = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Pull with a merge strategy, where a conflict occurs", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("file", "content1") + shell.Commit("one") + shell.UpdateFileAndAdd("file", "content2") + shell.Commit("two") + shell.EmptyCommit("three") + + shell.CloneIntoRemote("origin") + + shell.SetBranchUpstream("master", "origin/master") + + shell.HardReset("HEAD^^") + shell.UpdateFileAndAdd("file", "content4") + shell.Commit("four") + + shell.SetConfig("pull.rebase", "false") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Lines( + Contains("four"), + Contains("one"), + ) + + t.Views().Status().Content(Contains("↓2 repo → master")) + + t.Views().Files(). + IsFocused(). + Press(keys.Universal.Pull) + + t.Actions().AcknowledgeConflicts() + + t.Views().Files(). + IsFocused(). + Lines( + Contains("UU").Contains("file"), + ). + PressEnter() + + t.Views().MergeConflicts(). + IsFocused(). + TopLines( + Contains("<<<<<<< HEAD"), + Contains("content4"), + Contains("======="), + Contains("content2"), + Contains(">>>>>>>"), + ). + PressPrimaryAction() // choose 'content4' + + t.Actions().ContinueOnConflictsResolved() + + t.Views().Status().Content(Contains("↑2 repo → master")) + + t.Views().Commits(). + Focus(). + Lines( + Contains("Merge branch 'master' of ../origin").IsSelected(), + Contains("three"), + Contains("two"), + Contains("four"), + Contains("one"), + ) + + t.Views().Main(). + Content( + Contains("- content4"). + Contains(" -content2"). + Contains("++content4"), + ) + }, +}) diff --git a/pkg/integration/tests/sync/pull_rebase.go b/pkg/integration/tests/sync/pull_rebase.go new file mode 100644 index 000000000..ca4c851d6 --- /dev/null +++ b/pkg/integration/tests/sync/pull_rebase.go @@ -0,0 +1,52 @@ +package sync + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var PullRebase = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Pull with a rebase strategy", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("file", "content1") + shell.Commit("one") + shell.UpdateFileAndAdd("file", "content2") + shell.Commit("two") + shell.EmptyCommit("three") + + shell.CloneIntoRemote("origin") + + shell.SetBranchUpstream("master", "origin/master") + + shell.HardReset("HEAD^^") + shell.EmptyCommit("four") + + shell.SetConfig("pull.rebase", "true") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Lines( + Contains("four"), + Contains("one"), + ) + + t.Views().Status().Content(Contains("↓2 repo → master")) + + t.Views().Files(). + IsFocused(). + Press(keys.Universal.Pull) + + t.Views().Status().Content(Contains("↑1 repo → master")) + + t.Views().Commits(). + Lines( + Contains("four"), + Contains("three"), + Contains("two"), + Contains("one"), + ) + }, +}) diff --git a/pkg/integration/tests/sync/pull_rebase_conflict.go b/pkg/integration/tests/sync/pull_rebase_conflict.go new file mode 100644 index 000000000..4ea419a74 --- /dev/null +++ b/pkg/integration/tests/sync/pull_rebase_conflict.go @@ -0,0 +1,83 @@ +package sync + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var PullRebaseConflict = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Pull with a rebase strategy, where a conflict occurs", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("file", "content1") + shell.Commit("one") + shell.UpdateFileAndAdd("file", "content2") + shell.Commit("two") + shell.EmptyCommit("three") + + shell.CloneIntoRemote("origin") + + shell.SetBranchUpstream("master", "origin/master") + + shell.HardReset("HEAD^^") + shell.UpdateFileAndAdd("file", "content4") + shell.Commit("four") + + shell.SetConfig("pull.rebase", "true") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Lines( + Contains("four"), + Contains("one"), + ) + + t.Views().Status().Content(Contains("↓2 repo → master")) + + t.Views().Files(). + IsFocused(). + Press(keys.Universal.Pull) + + t.Actions().AcknowledgeConflicts() + + t.Views().Files(). + IsFocused(). + Lines( + Contains("UU").Contains("file"), + ). + PressEnter() + + t.Views().MergeConflicts(). + IsFocused(). + TopLines( + Contains("<<<<<<< HEAD"), + Contains("content2"), + Contains("======="), + Contains("content4"), + Contains(">>>>>>>"), + ). + SelectNextItem(). + PressPrimaryAction() // choose 'content4' + + t.Actions().ContinueOnConflictsResolved() + + t.Views().Status().Content(Contains("↑1 repo → master")) + + t.Views().Commits(). + Focus(). + Lines( + Contains("four").IsSelected(), + Contains("three"), + Contains("two"), + Contains("one"), + ) + + t.Views().Main(). + Content( + Contains("-content2"). + Contains("+content4"), + ) + }, +}) diff --git a/pkg/integration/tests/sync/pull_rebase_interactive_conflict.go b/pkg/integration/tests/sync/pull_rebase_interactive_conflict.go new file mode 100644 index 000000000..da45f70ed --- /dev/null +++ b/pkg/integration/tests/sync/pull_rebase_interactive_conflict.go @@ -0,0 +1,95 @@ +package sync + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var PullRebaseInteractiveConflict = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Pull with an interactive rebase strategy, where a conflict occurs", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("file", "content1") + shell.Commit("one") + shell.UpdateFileAndAdd("file", "content2") + shell.Commit("two") + shell.EmptyCommit("three") + + shell.CloneIntoRemote("origin") + + shell.SetBranchUpstream("master", "origin/master") + + shell.HardReset("HEAD^^") + shell.UpdateFileAndAdd("file", "content4") + shell.Commit("four") + shell.EmptyCommit("five") + + shell.SetConfig("pull.rebase", "interactive") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Lines( + Contains("five"), + Contains("four"), + Contains("one"), + ) + + t.Views().Status().Content(Contains("↓2 repo → master")) + + t.Views().Files(). + IsFocused(). + Press(keys.Universal.Pull) + + t.Actions().AcknowledgeConflicts() + + t.Views().Commits(). + Lines( + Contains("pick").Contains("five"), + Contains("YOU ARE HERE").Contains("three"), + Contains("two"), + Contains("one"), + ) + + t.Views().Files(). + IsFocused(). + Lines( + Contains("UU").Contains("file"), + ). + PressEnter() + + t.Views().MergeConflicts(). + IsFocused(). + TopLines( + Contains("<<<<<<< HEAD"), + Contains("content2"), + Contains("======="), + Contains("content4"), + Contains(">>>>>>>"), + ). + SelectNextItem(). + PressPrimaryAction() // choose 'content4' + + t.Actions().ContinueOnConflictsResolved() + + t.Views().Status().Content(Contains("↑2 repo → master")) + + t.Views().Commits(). + Focus(). + Lines( + Contains("five").IsSelected(), + Contains("four"), + Contains("three"), + Contains("two"), + Contains("one"), + ). + SelectNextItem() + + t.Views().Main(). + Content( + Contains("-content2"). + Contains("+content4"), + ) + }, +}) diff --git a/pkg/integration/tests/sync/pull_rebase_interactive_conflict_drop.go b/pkg/integration/tests/sync/pull_rebase_interactive_conflict_drop.go new file mode 100644 index 000000000..580a2af5b --- /dev/null +++ b/pkg/integration/tests/sync/pull_rebase_interactive_conflict_drop.go @@ -0,0 +1,101 @@ +package sync + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var PullRebaseInteractiveConflictDrop = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Pull with an interactive rebase strategy, where a conflict occurs. Also drop a commit while rebasing", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("file", "content1") + shell.Commit("one") + shell.UpdateFileAndAdd("file", "content2") + shell.Commit("two") + shell.EmptyCommit("three") + + shell.CloneIntoRemote("origin") + + shell.SetBranchUpstream("master", "origin/master") + + shell.HardReset("HEAD^^") + shell.UpdateFileAndAdd("file", "content4") + shell.Commit("four") + shell.EmptyCommit("five") + + shell.SetConfig("pull.rebase", "interactive") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Lines( + Contains("five"), + Contains("four"), + Contains("one"), + ) + + t.Views().Status().Content(Contains("↓2 repo → master")) + + t.Views().Files(). + IsFocused(). + Press(keys.Universal.Pull) + + t.Actions().AcknowledgeConflicts() + + t.Views().Commits(). + Focus(). + Lines( + Contains("pick").Contains("five").IsSelected(), + Contains("YOU ARE HERE").Contains("three"), + Contains("two"), + Contains("one"), + ). + Press(keys.Universal.Remove). + Lines( + Contains("drop").Contains("five").IsSelected(), + Contains("YOU ARE HERE").Contains("three"), + Contains("two"), + Contains("one"), + ) + + t.Views().Files(). + Focus(). + Lines( + Contains("UU").Contains("file"), + ). + PressEnter() + + t.Views().MergeConflicts(). + IsFocused(). + TopLines( + Contains("<<<<<<< HEAD"), + Contains("content2"), + Contains("======="), + Contains("content4"), + Contains(">>>>>>>"), + ). + SelectNextItem(). + PressPrimaryAction() // choose 'content4' + + t.Actions().ContinueOnConflictsResolved() + + t.Views().Status().Content(Contains("↑1 repo → master")) + + t.Views().Commits(). + Focus(). + Lines( + Contains("four").IsSelected(), + Contains("three"), + Contains("two"), + Contains("one"), + ) + + t.Views().Main(). + Content( + Contains("-content2"). + Contains("+content4"), + ) + }, +}) diff --git a/pkg/integration/tests/tests_gen.go b/pkg/integration/tests/tests_gen.go index 635451b54..c99870d43 100644 --- a/pkg/integration/tests/tests_gen.go +++ b/pkg/integration/tests/tests_gen.go @@ -121,6 +121,12 @@ var tests = []*components.IntegrationTest{ sync.ForcePushMultipleUpstream, sync.Pull, sync.PullAndSetUpstream, + sync.PullMerge, + sync.PullMergeConflict, + sync.PullRebase, + sync.PullRebaseConflict, + sync.PullRebaseInteractiveConflict, + sync.PullRebaseInteractiveConflictDrop, sync.Push, sync.PushAndAutoSetUpstream, sync.PushAndSetUpstream, diff --git a/test/integration/pullMerge/expected/origin/HEAD b/test/integration/pullMerge/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pullMerge/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pullMerge/expected/origin/config b/test/integration/pullMerge/expected/origin/config deleted file mode 100644 index 90705ff13..000000000 --- a/test/integration/pullMerge/expected/origin/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullMerge/actual/./repo diff --git a/test/integration/pullMerge/expected/origin/description b/test/integration/pullMerge/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pullMerge/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullMerge/expected/origin/info/exclude b/test/integration/pullMerge/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pullMerge/expected/origin/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# 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 diff --git a/test/integration/pullMerge/expected/origin/objects/0d/5dd7784063912fe3efeaf7d2b6782019ee9e6e b/test/integration/pullMerge/expected/origin/objects/0d/5dd7784063912fe3efeaf7d2b6782019ee9e6e deleted file mode 100644 index ce0f31a5a..000000000 Binary files a/test/integration/pullMerge/expected/origin/objects/0d/5dd7784063912fe3efeaf7d2b6782019ee9e6e and /dev/null differ diff --git a/test/integration/pullMerge/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullMerge/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/pullMerge/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/pullMerge/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullMerge/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/pullMerge/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/pullMerge/expected/origin/objects/22/4786fb3e4a16b22b4e2b43fe01d7797491adad b/test/integration/pullMerge/expected/origin/objects/22/4786fb3e4a16b22b4e2b43fe01d7797491adad deleted file mode 100644 index 660fe0a45..000000000 --- a/test/integration/pullMerge/expected/origin/objects/22/4786fb3e4a16b22b4e2b43fe01d7797491adad +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@ѮsJF))1P!")#tyS5[ SPDYXgӽsuq8􈶭zK@&I"zzNɝ}˲*6%, \ No newline at end of file diff --git a/test/integration/pullMerge/expected/origin/objects/29/1b985e75f255f9947f064aee9e1f37af1a930d b/test/integration/pullMerge/expected/origin/objects/29/1b985e75f255f9947f064aee9e1f37af1a930d deleted file mode 100644 index e4b84263d..000000000 --- a/test/integration/pullMerge/expected/origin/objects/29/1b985e75f255f9947f064aee9e1f37af1a930d +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9E$Dz`R"~kkKwU*NJ4!sVaG>9$4[-PH$`UZ5W)nb0&e5n^ܶ^,2EOQX'7[9% \ No newline at end of file diff --git a/test/integration/pullMerge/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullMerge/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/pullMerge/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/pullMerge/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullMerge/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba..000000000 Binary files a/test/integration/pullMerge/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 and /dev/null differ diff --git a/test/integration/pullMerge/expected/origin/objects/82/422401226cbf89b60b7ba3c6d4fa74781250c9 b/test/integration/pullMerge/expected/origin/objects/82/422401226cbf89b60b7ba3c6d4fa74781250c9 deleted file mode 100644 index 4e97dab19..000000000 Binary files a/test/integration/pullMerge/expected/origin/objects/82/422401226cbf89b60b7ba3c6d4fa74781250c9 and /dev/null differ diff --git a/test/integration/pullMerge/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullMerge/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/pullMerge/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/pullMerge/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullMerge/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/pullMerge/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/pullMerge/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullMerge/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/pullMerge/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/pullMerge/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullMerge/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/pullMerge/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/pullMerge/expected/origin/packed-refs b/test/integration/pullMerge/expected/origin/packed-refs deleted file mode 100644 index e6e25ae85..000000000 --- a/test/integration/pullMerge/expected/origin/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -291b985e75f255f9947f064aee9e1f37af1a930d refs/heads/master diff --git a/test/integration/pullMerge/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/pullMerge/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 51be8ec3d..000000000 --- a/test/integration/pullMerge/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -myfile4 diff --git a/test/integration/pullMerge/expected/repo/.git_keep/FETCH_HEAD b/test/integration/pullMerge/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index 0b3113c2b..000000000 --- a/test/integration/pullMerge/expected/repo/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -291b985e75f255f9947f064aee9e1f37af1a930d branch 'master' of ../origin diff --git a/test/integration/pullMerge/expected/repo/.git_keep/HEAD b/test/integration/pullMerge/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pullMerge/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pullMerge/expected/repo/.git_keep/ORIG_HEAD b/test/integration/pullMerge/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 83635ede7..000000000 --- a/test/integration/pullMerge/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -673a4237450c6ea2a27b18f1d7a3c9293c5606ea diff --git a/test/integration/pullMerge/expected/repo/.git_keep/config b/test/integration/pullMerge/expected/repo/.git_keep/config deleted file mode 100644 index 1cff3a489..000000000 --- a/test/integration/pullMerge/expected/repo/.git_keep/config +++ /dev/null @@ -1,18 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[remote "origin"] - url = ../origin - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master -[pull] - rebase = false diff --git a/test/integration/pullMerge/expected/repo/.git_keep/description b/test/integration/pullMerge/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pullMerge/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullMerge/expected/repo/.git_keep/index b/test/integration/pullMerge/expected/repo/.git_keep/index deleted file mode 100644 index fc9d5cb17..000000000 Binary files a/test/integration/pullMerge/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/pullMerge/expected/repo/.git_keep/info/exclude b/test/integration/pullMerge/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pullMerge/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# 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 diff --git a/test/integration/pullMerge/expected/repo/.git_keep/logs/HEAD b/test/integration/pullMerge/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index b3175cf78..000000000 --- a/test/integration/pullMerge/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 224786fb3e4a16b22b4e2b43fe01d7797491adad CI 1648348767 +1100 commit (initial): myfile1 -224786fb3e4a16b22b4e2b43fe01d7797491adad 82422401226cbf89b60b7ba3c6d4fa74781250c9 CI 1648348767 +1100 commit: myfile2 -82422401226cbf89b60b7ba3c6d4fa74781250c9 0d5dd7784063912fe3efeaf7d2b6782019ee9e6e CI 1648348767 +1100 commit: myfile3 -0d5dd7784063912fe3efeaf7d2b6782019ee9e6e 291b985e75f255f9947f064aee9e1f37af1a930d CI 1648348767 +1100 commit: myfile4 -291b985e75f255f9947f064aee9e1f37af1a930d 82422401226cbf89b60b7ba3c6d4fa74781250c9 CI 1648348767 +1100 reset: moving to HEAD~2 -82422401226cbf89b60b7ba3c6d4fa74781250c9 673a4237450c6ea2a27b18f1d7a3c9293c5606ea CI 1648348767 +1100 commit: myfile4 -673a4237450c6ea2a27b18f1d7a3c9293c5606ea a61316509295a5644a82e38e8bd455422fe477c5 CI 1648348768 +1100 pull --no-edit: Merge made by the 'recursive' strategy. diff --git a/test/integration/pullMerge/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pullMerge/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index b3175cf78..000000000 --- a/test/integration/pullMerge/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 224786fb3e4a16b22b4e2b43fe01d7797491adad CI 1648348767 +1100 commit (initial): myfile1 -224786fb3e4a16b22b4e2b43fe01d7797491adad 82422401226cbf89b60b7ba3c6d4fa74781250c9 CI 1648348767 +1100 commit: myfile2 -82422401226cbf89b60b7ba3c6d4fa74781250c9 0d5dd7784063912fe3efeaf7d2b6782019ee9e6e CI 1648348767 +1100 commit: myfile3 -0d5dd7784063912fe3efeaf7d2b6782019ee9e6e 291b985e75f255f9947f064aee9e1f37af1a930d CI 1648348767 +1100 commit: myfile4 -291b985e75f255f9947f064aee9e1f37af1a930d 82422401226cbf89b60b7ba3c6d4fa74781250c9 CI 1648348767 +1100 reset: moving to HEAD~2 -82422401226cbf89b60b7ba3c6d4fa74781250c9 673a4237450c6ea2a27b18f1d7a3c9293c5606ea CI 1648348767 +1100 commit: myfile4 -673a4237450c6ea2a27b18f1d7a3c9293c5606ea a61316509295a5644a82e38e8bd455422fe477c5 CI 1648348768 +1100 pull --no-edit: Merge made by the 'recursive' strategy. diff --git a/test/integration/pullMerge/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullMerge/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 57e616700..000000000 --- a/test/integration/pullMerge/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 291b985e75f255f9947f064aee9e1f37af1a930d CI 1648348767 +1100 fetch origin: storing head diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/0d/5dd7784063912fe3efeaf7d2b6782019ee9e6e b/test/integration/pullMerge/expected/repo/.git_keep/objects/0d/5dd7784063912fe3efeaf7d2b6782019ee9e6e deleted file mode 100644 index ce0f31a5a..000000000 Binary files a/test/integration/pullMerge/expected/repo/.git_keep/objects/0d/5dd7784063912fe3efeaf7d2b6782019ee9e6e and /dev/null differ diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullMerge/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/pullMerge/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullMerge/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/pullMerge/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/22/4786fb3e4a16b22b4e2b43fe01d7797491adad b/test/integration/pullMerge/expected/repo/.git_keep/objects/22/4786fb3e4a16b22b4e2b43fe01d7797491adad deleted file mode 100644 index 660fe0a45..000000000 --- a/test/integration/pullMerge/expected/repo/.git_keep/objects/22/4786fb3e4a16b22b4e2b43fe01d7797491adad +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@ѮsJF))1P!")#tyS5[ SPDYXgӽsuq8􈶭zK@&I"zzNɝ}˲*6%, \ No newline at end of file diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/29/1b985e75f255f9947f064aee9e1f37af1a930d b/test/integration/pullMerge/expected/repo/.git_keep/objects/29/1b985e75f255f9947f064aee9e1f37af1a930d deleted file mode 100644 index e4b84263d..000000000 --- a/test/integration/pullMerge/expected/repo/.git_keep/objects/29/1b985e75f255f9947f064aee9e1f37af1a930d +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9E$Dz`R"~kkKwU*NJ4!sVaG>9$4[-PH$`UZ5W)nb0&e5n^ܶ^,2EOQX'7[9% \ No newline at end of file diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullMerge/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/pullMerge/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullMerge/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba..000000000 Binary files a/test/integration/pullMerge/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 and /dev/null differ diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/67/3a4237450c6ea2a27b18f1d7a3c9293c5606ea b/test/integration/pullMerge/expected/repo/.git_keep/objects/67/3a4237450c6ea2a27b18f1d7a3c9293c5606ea deleted file mode 100644 index c630a6f65..000000000 Binary files a/test/integration/pullMerge/expected/repo/.git_keep/objects/67/3a4237450c6ea2a27b18f1d7a3c9293c5606ea and /dev/null differ diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/82/422401226cbf89b60b7ba3c6d4fa74781250c9 b/test/integration/pullMerge/expected/repo/.git_keep/objects/82/422401226cbf89b60b7ba3c6d4fa74781250c9 deleted file mode 100644 index 4e97dab19..000000000 Binary files a/test/integration/pullMerge/expected/repo/.git_keep/objects/82/422401226cbf89b60b7ba3c6d4fa74781250c9 and /dev/null differ diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullMerge/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/pullMerge/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/a6/1316509295a5644a82e38e8bd455422fe477c5 b/test/integration/pullMerge/expected/repo/.git_keep/objects/a6/1316509295a5644a82e38e8bd455422fe477c5 deleted file mode 100644 index f75c94690..000000000 Binary files a/test/integration/pullMerge/expected/repo/.git_keep/objects/a6/1316509295a5644a82e38e8bd455422fe477c5 and /dev/null differ diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullMerge/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/pullMerge/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 b/test/integration/pullMerge/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 deleted file mode 100644 index 5e9361d35..000000000 Binary files a/test/integration/pullMerge/expected/repo/.git_keep/objects/ce/0848710343a75263ea72cb5bdfa666b9ecda68 and /dev/null differ diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullMerge/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/pullMerge/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/pullMerge/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullMerge/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/pullMerge/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/pullMerge/expected/repo/.git_keep/refs/heads/master b/test/integration/pullMerge/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index b1c046dd7..000000000 --- a/test/integration/pullMerge/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -a61316509295a5644a82e38e8bd455422fe477c5 diff --git a/test/integration/pullMerge/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pullMerge/expected/repo/.git_keep/refs/remotes/origin/master deleted file mode 100644 index c2b075905..000000000 --- a/test/integration/pullMerge/expected/repo/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -291b985e75f255f9947f064aee9e1f37af1a930d diff --git a/test/integration/pullMerge/expected/repo/myfile1 b/test/integration/pullMerge/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/pullMerge/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/pullMerge/expected/repo/myfile2 b/test/integration/pullMerge/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/pullMerge/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/pullMerge/expected/repo/myfile3 b/test/integration/pullMerge/expected/repo/myfile3 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/pullMerge/expected/repo/myfile3 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/pullMerge/expected/repo/myfile4 b/test/integration/pullMerge/expected/repo/myfile4 deleted file mode 100644 index d234c5e05..000000000 --- a/test/integration/pullMerge/expected/repo/myfile4 +++ /dev/null @@ -1 +0,0 @@ -test4 diff --git a/test/integration/pullMerge/recording.json b/test/integration/pullMerge/recording.json deleted file mode 100644 index 9b948e3eb..000000000 --- a/test/integration/pullMerge/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":537,"Mod":0,"Key":256,"Ch":112},{"Timestamp":1401,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/pullMerge/setup.sh b/test/integration/pullMerge/setup.sh deleted file mode 100644 index 36d825537..000000000 --- a/test/integration/pullMerge/setup.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -set -e - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -echo test1 > myfile1 -git add . -git commit -am "myfile1" -echo test2 > myfile2 -git add . -git commit -am "myfile2" -echo test3 > myfile3 -git add . -git commit -am "myfile3" -echo test4 > myfile4 -git add . -git commit -am "myfile4" - -cd .. -git clone --bare ./repo origin - -cd repo - -git reset --hard HEAD~2 - -echo test4 > myfile4 -git add . -git commit -am "myfile4" - -git remote add origin ../origin -git fetch origin -git branch --set-upstream-to=origin/master master - -git config pull.rebase false diff --git a/test/integration/pullMerge/test.json b/test/integration/pullMerge/test.json deleted file mode 100644 index 8ce8c71bb..000000000 --- a/test/integration/pullMerge/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "When user has configured pull with merge, ensure a merge commit is created upon pull", "speed": 10 } diff --git a/test/integration/pullMergeConflict/expected/origin/HEAD b/test/integration/pullMergeConflict/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pullMergeConflict/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pullMergeConflict/expected/origin/config b/test/integration/pullMergeConflict/expected/origin/config deleted file mode 100644 index 53f811d27..000000000 --- a/test/integration/pullMergeConflict/expected/origin/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullMergeConflict/actual/./repo diff --git a/test/integration/pullMergeConflict/expected/origin/description b/test/integration/pullMergeConflict/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pullMergeConflict/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullMergeConflict/expected/origin/info/exclude b/test/integration/pullMergeConflict/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pullMergeConflict/expected/origin/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# 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 diff --git a/test/integration/pullMergeConflict/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullMergeConflict/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/pullMergeConflict/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/pullMergeConflict/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullMergeConflict/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/pullMergeConflict/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/pullMergeConflict/expected/origin/objects/29/c0636a86cc64292b7a6b1083c2df10de9cde6c b/test/integration/pullMergeConflict/expected/origin/objects/29/c0636a86cc64292b7a6b1083c2df10de9cde6c deleted file mode 100644 index 26794f8c9..000000000 --- a/test/integration/pullMergeConflict/expected/origin/objects/29/c0636a86cc64292b7a6b1083c2df10de9cde6c +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9Ed$c`R"~׵[(x껈JEÐp9DDC wyu[dQX 1648349178 +1100 commit (initial): myfile1 -7c201cb45dc62900f5f42281c1235219df5d0388 77a75278eb08101403d727a8ecaad724f5d9dc78 CI 1648349178 +1100 commit: myfile2 -77a75278eb08101403d727a8ecaad724f5d9dc78 c7180f424ee6b59241eecffedcfa4472a86d927d CI 1648349178 +1100 commit: myfile3 -c7180f424ee6b59241eecffedcfa4472a86d927d 29c0636a86cc64292b7a6b1083c2df10de9cde6c CI 1648349178 +1100 commit: myfile4 -29c0636a86cc64292b7a6b1083c2df10de9cde6c 77a75278eb08101403d727a8ecaad724f5d9dc78 CI 1648349178 +1100 reset: moving to HEAD~2 -77a75278eb08101403d727a8ecaad724f5d9dc78 4db288af7bc797a3819441c734a4c4e7e3635296 CI 1648349178 +1100 commit: myfile4 conflict -4db288af7bc797a3819441c734a4c4e7e3635296 c25833e74799f64c317fe3f112f934fcc57b71f9 CI 1648349183 +1100 commit (merge): Merge branch 'master' of ../origin diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index d67e84881..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 7c201cb45dc62900f5f42281c1235219df5d0388 CI 1648349178 +1100 commit (initial): myfile1 -7c201cb45dc62900f5f42281c1235219df5d0388 77a75278eb08101403d727a8ecaad724f5d9dc78 CI 1648349178 +1100 commit: myfile2 -77a75278eb08101403d727a8ecaad724f5d9dc78 c7180f424ee6b59241eecffedcfa4472a86d927d CI 1648349178 +1100 commit: myfile3 -c7180f424ee6b59241eecffedcfa4472a86d927d 29c0636a86cc64292b7a6b1083c2df10de9cde6c CI 1648349178 +1100 commit: myfile4 -29c0636a86cc64292b7a6b1083c2df10de9cde6c 77a75278eb08101403d727a8ecaad724f5d9dc78 CI 1648349178 +1100 reset: moving to HEAD~2 -77a75278eb08101403d727a8ecaad724f5d9dc78 4db288af7bc797a3819441c734a4c4e7e3635296 CI 1648349178 +1100 commit: myfile4 conflict -4db288af7bc797a3819441c734a4c4e7e3635296 c25833e74799f64c317fe3f112f934fcc57b71f9 CI 1648349183 +1100 commit (merge): Merge branch 'master' of ../origin diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 9d875f2ce..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 29c0636a86cc64292b7a6b1083c2df10de9cde6c CI 1648349178 +1100 fetch origin: storing head diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/29/c0636a86cc64292b7a6b1083c2df10de9cde6c b/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/29/c0636a86cc64292b7a6b1083c2df10de9cde6c deleted file mode 100644 index 26794f8c9..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/objects/29/c0636a86cc64292b7a6b1083c2df10de9cde6c +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9Ed$c`R"~׵[(x껈JEÐp9DDC wyu[dQX myfile1 -git add . -git commit -am "myfile1" -echo test2 > myfile2 -git add . -git commit -am "myfile2" -echo test3 > myfile3 -git add . -git commit -am "myfile3" -echo test4 > myfile4 -git add . -git commit -am "myfile4" - -cd .. -git clone --bare ./repo origin - -cd repo - -git reset --hard HEAD~2 - -echo conflict > myfile4 -git add . -git commit -am "myfile4 conflict" - -git remote add origin ../origin -git fetch origin -git branch --set-upstream-to=origin/master master - -git config pull.rebase false diff --git a/test/integration/pullMergeConflict/test.json b/test/integration/pullMergeConflict/test.json deleted file mode 100644 index c1d7a3480..000000000 --- a/test/integration/pullMergeConflict/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "When user has configured pull with merge, ensure we handle conflicts", "speed": 5 } diff --git a/test/integration/pullRebase/expected/origin/HEAD b/test/integration/pullRebase/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pullRebase/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pullRebase/expected/origin/config b/test/integration/pullRebase/expected/origin/config deleted file mode 100644 index 3b62fd0ac..000000000 --- a/test/integration/pullRebase/expected/origin/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullRebase/actual/./repo diff --git a/test/integration/pullRebase/expected/origin/description b/test/integration/pullRebase/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pullRebase/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullRebase/expected/origin/info/exclude b/test/integration/pullRebase/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pullRebase/expected/origin/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# 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 diff --git a/test/integration/pullRebase/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebase/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/pullRebase/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/pullRebase/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullRebase/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/pullRebase/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/pullRebase/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullRebase/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/pullRebase/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/pullRebase/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebase/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba..000000000 Binary files a/test/integration/pullRebase/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 and /dev/null differ diff --git a/test/integration/pullRebase/expected/origin/objects/7b/a4176e37b24d5c97f17214ca6d658dbc58ef9d b/test/integration/pullRebase/expected/origin/objects/7b/a4176e37b24d5c97f17214ca6d658dbc58ef9d deleted file mode 100644 index 285b95bdd..000000000 --- a/test/integration/pullRebase/expected/origin/objects/7b/a4176e37b24d5c97f17214ca6d658dbc58ef9d +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@ѮsLJ)1P!ER#tyS5[˥m*`4df 9Tz%wuq8tY=CǃGW"DwsO(˪~1L, \ No newline at end of file diff --git a/test/integration/pullRebase/expected/origin/objects/84/b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 b/test/integration/pullRebase/expected/origin/objects/84/b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 deleted file mode 100644 index 93ffd3015..000000000 Binary files a/test/integration/pullRebase/expected/origin/objects/84/b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 and /dev/null differ diff --git a/test/integration/pullRebase/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullRebase/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/pullRebase/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/pullRebase/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullRebase/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/pullRebase/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/pullRebase/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullRebase/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/pullRebase/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/pullRebase/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullRebase/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/pullRebase/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/pullRebase/expected/origin/objects/f2/744f41facc4c70c41f07c93c2a5fc010b4ccf6 b/test/integration/pullRebase/expected/origin/objects/f2/744f41facc4c70c41f07c93c2a5fc010b4ccf6 deleted file mode 100644 index 48bff47be..000000000 Binary files a/test/integration/pullRebase/expected/origin/objects/f2/744f41facc4c70c41f07c93c2a5fc010b4ccf6 and /dev/null differ diff --git a/test/integration/pullRebase/expected/origin/objects/f2/b972db67c4667ac1896df3556a2cb2422bef8a b/test/integration/pullRebase/expected/origin/objects/f2/b972db67c4667ac1896df3556a2cb2422bef8a deleted file mode 100644 index c6127ca4a..000000000 Binary files a/test/integration/pullRebase/expected/origin/objects/f2/b972db67c4667ac1896df3556a2cb2422bef8a and /dev/null differ diff --git a/test/integration/pullRebase/expected/origin/packed-refs b/test/integration/pullRebase/expected/origin/packed-refs deleted file mode 100644 index 2eebc50dc..000000000 --- a/test/integration/pullRebase/expected/origin/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -f2b972db67c4667ac1896df3556a2cb2422bef8a refs/heads/master diff --git a/test/integration/pullRebase/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/pullRebase/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index ecdf2bdc8..000000000 --- a/test/integration/pullRebase/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -myfile5 diff --git a/test/integration/pullRebase/expected/repo/.git_keep/FETCH_HEAD b/test/integration/pullRebase/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index c1bf8040c..000000000 --- a/test/integration/pullRebase/expected/repo/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -f2b972db67c4667ac1896df3556a2cb2422bef8a branch 'master' of ../origin diff --git a/test/integration/pullRebase/expected/repo/.git_keep/HEAD b/test/integration/pullRebase/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pullRebase/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pullRebase/expected/repo/.git_keep/ORIG_HEAD b/test/integration/pullRebase/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 992a72681..000000000 --- a/test/integration/pullRebase/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -25b115c8ff09bf59b023af22277ea140b2833110 diff --git a/test/integration/pullRebase/expected/repo/.git_keep/config b/test/integration/pullRebase/expected/repo/.git_keep/config deleted file mode 100644 index c85b6d3bb..000000000 --- a/test/integration/pullRebase/expected/repo/.git_keep/config +++ /dev/null @@ -1,18 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[remote "origin"] - url = ../origin - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master -[pull] - rebase = true diff --git a/test/integration/pullRebase/expected/repo/.git_keep/description b/test/integration/pullRebase/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pullRebase/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullRebase/expected/repo/.git_keep/index b/test/integration/pullRebase/expected/repo/.git_keep/index deleted file mode 100644 index f694dd5ca..000000000 Binary files a/test/integration/pullRebase/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/pullRebase/expected/repo/.git_keep/info/exclude b/test/integration/pullRebase/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pullRebase/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# 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 diff --git a/test/integration/pullRebase/expected/repo/.git_keep/logs/HEAD b/test/integration/pullRebase/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index db78f7c3e..000000000 --- a/test/integration/pullRebase/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,9 +0,0 @@ -0000000000000000000000000000000000000000 7ba4176e37b24d5c97f17214ca6d658dbc58ef9d CI 1648349202 +1100 commit (initial): myfile1 -7ba4176e37b24d5c97f17214ca6d658dbc58ef9d 84b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 CI 1648349202 +1100 commit: myfile2 -84b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 f2744f41facc4c70c41f07c93c2a5fc010b4ccf6 CI 1648349202 +1100 commit: myfile3 -f2744f41facc4c70c41f07c93c2a5fc010b4ccf6 f2b972db67c4667ac1896df3556a2cb2422bef8a CI 1648349203 +1100 commit: myfile4 -f2b972db67c4667ac1896df3556a2cb2422bef8a 84b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 CI 1648349203 +1100 reset: moving to HEAD~2 -84b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 25b115c8ff09bf59b023af22277ea140b2833110 CI 1648349203 +1100 commit: myfile5 -25b115c8ff09bf59b023af22277ea140b2833110 f2b972db67c4667ac1896df3556a2cb2422bef8a CI 1648349204 +1100 pull --no-edit: checkout f2b972db67c4667ac1896df3556a2cb2422bef8a -f2b972db67c4667ac1896df3556a2cb2422bef8a ef833c09ff39663448dd9582e3d6ac1fa777fb4f CI 1648349204 +1100 pull --no-edit: myfile5 -ef833c09ff39663448dd9582e3d6ac1fa777fb4f ef833c09ff39663448dd9582e3d6ac1fa777fb4f CI 1648349204 +1100 rebase finished: returning to refs/heads/master diff --git a/test/integration/pullRebase/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pullRebase/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 906b261f3..000000000 --- a/test/integration/pullRebase/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 7ba4176e37b24d5c97f17214ca6d658dbc58ef9d CI 1648349202 +1100 commit (initial): myfile1 -7ba4176e37b24d5c97f17214ca6d658dbc58ef9d 84b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 CI 1648349202 +1100 commit: myfile2 -84b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 f2744f41facc4c70c41f07c93c2a5fc010b4ccf6 CI 1648349202 +1100 commit: myfile3 -f2744f41facc4c70c41f07c93c2a5fc010b4ccf6 f2b972db67c4667ac1896df3556a2cb2422bef8a CI 1648349203 +1100 commit: myfile4 -f2b972db67c4667ac1896df3556a2cb2422bef8a 84b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 CI 1648349203 +1100 reset: moving to HEAD~2 -84b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 25b115c8ff09bf59b023af22277ea140b2833110 CI 1648349203 +1100 commit: myfile5 -25b115c8ff09bf59b023af22277ea140b2833110 ef833c09ff39663448dd9582e3d6ac1fa777fb4f CI 1648349204 +1100 rebase finished: returning to refs/heads/master diff --git a/test/integration/pullRebase/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullRebase/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index ccc2918cc..000000000 --- a/test/integration/pullRebase/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 f2b972db67c4667ac1896df3556a2cb2422bef8a CI 1648349203 +1100 fetch origin: storing head diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebase/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/pullRebase/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullRebase/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/pullRebase/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/25/b115c8ff09bf59b023af22277ea140b2833110 b/test/integration/pullRebase/expected/repo/.git_keep/objects/25/b115c8ff09bf59b023af22277ea140b2833110 deleted file mode 100644 index 38ec4954a..000000000 Binary files a/test/integration/pullRebase/expected/repo/.git_keep/objects/25/b115c8ff09bf59b023af22277ea140b2833110 and /dev/null differ diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullRebase/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/pullRebase/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebase/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba..000000000 Binary files a/test/integration/pullRebase/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 and /dev/null differ diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/7b/a4176e37b24d5c97f17214ca6d658dbc58ef9d b/test/integration/pullRebase/expected/repo/.git_keep/objects/7b/a4176e37b24d5c97f17214ca6d658dbc58ef9d deleted file mode 100644 index 285b95bdd..000000000 --- a/test/integration/pullRebase/expected/repo/.git_keep/objects/7b/a4176e37b24d5c97f17214ca6d658dbc58ef9d +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@ѮsLJ)1P!ER#tyS5[˥m*`4df 9Tz%wuq8tY=CǃGW"DwsO(˪~1L, \ No newline at end of file diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/84/b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 b/test/integration/pullRebase/expected/repo/.git_keep/objects/84/b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 deleted file mode 100644 index 93ffd3015..000000000 Binary files a/test/integration/pullRebase/expected/repo/.git_keep/objects/84/b9e43914aa7ae61a869a6b17cf0ec9f1bf04a9 and /dev/null differ diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/92/c2dd111eeb7daf4a0e30faff73b9441103805d b/test/integration/pullRebase/expected/repo/.git_keep/objects/92/c2dd111eeb7daf4a0e30faff73b9441103805d deleted file mode 100644 index 7820c1e95..000000000 Binary files a/test/integration/pullRebase/expected/repo/.git_keep/objects/92/c2dd111eeb7daf4a0e30faff73b9441103805d and /dev/null differ diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/98/fea3de076a474cabfac7130669625879051d43 b/test/integration/pullRebase/expected/repo/.git_keep/objects/98/fea3de076a474cabfac7130669625879051d43 deleted file mode 100644 index 6b5097ac8..000000000 Binary files a/test/integration/pullRebase/expected/repo/.git_keep/objects/98/fea3de076a474cabfac7130669625879051d43 and /dev/null differ diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullRebase/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/pullRebase/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullRebase/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/pullRebase/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullRebase/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/pullRebase/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullRebase/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/pullRebase/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/ef/833c09ff39663448dd9582e3d6ac1fa777fb4f b/test/integration/pullRebase/expected/repo/.git_keep/objects/ef/833c09ff39663448dd9582e3d6ac1fa777fb4f deleted file mode 100644 index 1bcc7cca9..000000000 Binary files a/test/integration/pullRebase/expected/repo/.git_keep/objects/ef/833c09ff39663448dd9582e3d6ac1fa777fb4f and /dev/null differ diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/f2/744f41facc4c70c41f07c93c2a5fc010b4ccf6 b/test/integration/pullRebase/expected/repo/.git_keep/objects/f2/744f41facc4c70c41f07c93c2a5fc010b4ccf6 deleted file mode 100644 index 48bff47be..000000000 Binary files a/test/integration/pullRebase/expected/repo/.git_keep/objects/f2/744f41facc4c70c41f07c93c2a5fc010b4ccf6 and /dev/null differ diff --git a/test/integration/pullRebase/expected/repo/.git_keep/objects/f2/b972db67c4667ac1896df3556a2cb2422bef8a b/test/integration/pullRebase/expected/repo/.git_keep/objects/f2/b972db67c4667ac1896df3556a2cb2422bef8a deleted file mode 100644 index c6127ca4a..000000000 Binary files a/test/integration/pullRebase/expected/repo/.git_keep/objects/f2/b972db67c4667ac1896df3556a2cb2422bef8a and /dev/null differ diff --git a/test/integration/pullRebase/expected/repo/.git_keep/refs/heads/master b/test/integration/pullRebase/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index ca6b94f6e..000000000 --- a/test/integration/pullRebase/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -ef833c09ff39663448dd9582e3d6ac1fa777fb4f diff --git a/test/integration/pullRebase/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pullRebase/expected/repo/.git_keep/refs/remotes/origin/master deleted file mode 100644 index 319df43c4..000000000 --- a/test/integration/pullRebase/expected/repo/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -f2b972db67c4667ac1896df3556a2cb2422bef8a diff --git a/test/integration/pullRebase/expected/repo/myfile1 b/test/integration/pullRebase/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/pullRebase/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/pullRebase/expected/repo/myfile2 b/test/integration/pullRebase/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/pullRebase/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/pullRebase/expected/repo/myfile3 b/test/integration/pullRebase/expected/repo/myfile3 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/pullRebase/expected/repo/myfile3 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/pullRebase/expected/repo/myfile4 b/test/integration/pullRebase/expected/repo/myfile4 deleted file mode 100644 index d234c5e05..000000000 --- a/test/integration/pullRebase/expected/repo/myfile4 +++ /dev/null @@ -1 +0,0 @@ -test4 diff --git a/test/integration/pullRebase/expected/repo/myfile5 b/test/integration/pullRebase/expected/repo/myfile5 deleted file mode 100644 index d234c5e05..000000000 --- a/test/integration/pullRebase/expected/repo/myfile5 +++ /dev/null @@ -1 +0,0 @@ -test4 diff --git a/test/integration/pullRebase/recording.json b/test/integration/pullRebase/recording.json deleted file mode 100644 index b23747e49..000000000 --- a/test/integration/pullRebase/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":581,"Mod":0,"Key":256,"Ch":112},{"Timestamp":1804,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/pullRebase/setup.sh b/test/integration/pullRebase/setup.sh deleted file mode 100644 index affe8b273..000000000 --- a/test/integration/pullRebase/setup.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -set -e - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -echo test1 > myfile1 -git add . -git commit -am "myfile1" -echo test2 > myfile2 -git add . -git commit -am "myfile2" -echo test3 > myfile3 -git add . -git commit -am "myfile3" -echo test4 > myfile4 -git add . -git commit -am "myfile4" - -cd .. -git clone --bare ./repo origin - -cd repo - -git reset --hard HEAD~2 - -echo test4 > myfile5 -git add . -git commit -am "myfile5" - -git remote add origin ../origin -git fetch origin -git branch --set-upstream-to=origin/master master - -git config pull.rebase true diff --git a/test/integration/pullRebase/test.json b/test/integration/pullRebase/test.json deleted file mode 100644 index 224a93e54..000000000 --- a/test/integration/pullRebase/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "When user has configured pull with rebase, ensure we rebase upon pull", "speed": 10 } diff --git a/test/integration/pullRebaseConflict/expected/origin/HEAD b/test/integration/pullRebaseConflict/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pullRebaseConflict/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pullRebaseConflict/expected/origin/config b/test/integration/pullRebaseConflict/expected/origin/config deleted file mode 100644 index 22a73c314..000000000 --- a/test/integration/pullRebaseConflict/expected/origin/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullRebaseConflict/actual/./repo diff --git a/test/integration/pullRebaseConflict/expected/origin/description b/test/integration/pullRebaseConflict/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pullRebaseConflict/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullRebaseConflict/expected/origin/info/exclude b/test/integration/pullRebaseConflict/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pullRebaseConflict/expected/origin/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# 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 diff --git a/test/integration/pullRebaseConflict/expected/origin/objects/00/36ac0e5f5536f55bfdfcb4e09927f1eed3b37b b/test/integration/pullRebaseConflict/expected/origin/objects/00/36ac0e5f5536f55bfdfcb4e09927f1eed3b37b deleted file mode 100644 index 92dba726a..000000000 --- a/test/integration/pullRebaseConflict/expected/origin/objects/00/36ac0e5f5536f55bfdfcb4e09927f1eed3b37b +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@ѮsLJ)1P!ER#tyS5[˥m*`4df 9Tz%wuq8tY=CǃW"DwsO(˪~1P, \ No newline at end of file diff --git a/test/integration/pullRebaseConflict/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebaseConflict/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/pullRebaseConflict/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullRebaseConflict/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/pullRebaseConflict/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullRebaseConflict/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/pullRebaseConflict/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebaseConflict/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba..000000000 Binary files a/test/integration/pullRebaseConflict/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/origin/objects/30/8a85a7f740d42925175560337196f952ac6cf6 b/test/integration/pullRebaseConflict/expected/origin/objects/30/8a85a7f740d42925175560337196f952ac6cf6 deleted file mode 100644 index cf8b94a34..000000000 Binary files a/test/integration/pullRebaseConflict/expected/origin/objects/30/8a85a7f740d42925175560337196f952ac6cf6 and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/origin/objects/70/2648e6efd5f8c60f5fe57e152850a5de756978 b/test/integration/pullRebaseConflict/expected/origin/objects/70/2648e6efd5f8c60f5fe57e152850a5de756978 deleted file mode 100644 index 04ef3447f..000000000 Binary files a/test/integration/pullRebaseConflict/expected/origin/objects/70/2648e6efd5f8c60f5fe57e152850a5de756978 and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullRebaseConflict/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/pullRebaseConflict/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullRebaseConflict/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/pullRebaseConflict/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/origin/objects/ae/0aa5a0d1c65005bd50012612b1c56c1ea06155 b/test/integration/pullRebaseConflict/expected/origin/objects/ae/0aa5a0d1c65005bd50012612b1c56c1ea06155 deleted file mode 100644 index 8ebe82e5a..000000000 Binary files a/test/integration/pullRebaseConflict/expected/origin/objects/ae/0aa5a0d1c65005bd50012612b1c56c1ea06155 and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullRebaseConflict/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/pullRebaseConflict/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullRebaseConflict/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/pullRebaseConflict/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/origin/packed-refs b/test/integration/pullRebaseConflict/expected/origin/packed-refs deleted file mode 100644 index edf7e7c39..000000000 --- a/test/integration/pullRebaseConflict/expected/origin/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -702648e6efd5f8c60f5fe57e152850a5de756978 refs/heads/master diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/pullRebaseConflict/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 2f4ead100..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -myfile4 conflict diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/FETCH_HEAD b/test/integration/pullRebaseConflict/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index d74d32218..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -702648e6efd5f8c60f5fe57e152850a5de756978 branch 'master' of ../origin diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/HEAD b/test/integration/pullRebaseConflict/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/ORIG_HEAD b/test/integration/pullRebaseConflict/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index c7f24c5a8..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -d450cc8f4e691e3043aac25ae71f0f1a3217368f diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/config b/test/integration/pullRebaseConflict/expected/repo/.git_keep/config deleted file mode 100644 index c85b6d3bb..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/.git_keep/config +++ /dev/null @@ -1,18 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[remote "origin"] - url = ../origin - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master -[pull] - rebase = true diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/description b/test/integration/pullRebaseConflict/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/index b/test/integration/pullRebaseConflict/expected/repo/.git_keep/index deleted file mode 100644 index ceeffd34e..000000000 Binary files a/test/integration/pullRebaseConflict/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/info/exclude b/test/integration/pullRebaseConflict/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# 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 diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/HEAD b/test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 89cdca1d7..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,9 +0,0 @@ -0000000000000000000000000000000000000000 0036ac0e5f5536f55bfdfcb4e09927f1eed3b37b CI 1648349220 +1100 commit (initial): myfile1 -0036ac0e5f5536f55bfdfcb4e09927f1eed3b37b 308a85a7f740d42925175560337196f952ac6cf6 CI 1648349220 +1100 commit: myfile2 -308a85a7f740d42925175560337196f952ac6cf6 ae0aa5a0d1c65005bd50012612b1c56c1ea06155 CI 1648349220 +1100 commit: myfile3 -ae0aa5a0d1c65005bd50012612b1c56c1ea06155 702648e6efd5f8c60f5fe57e152850a5de756978 CI 1648349220 +1100 commit: myfile4 -702648e6efd5f8c60f5fe57e152850a5de756978 308a85a7f740d42925175560337196f952ac6cf6 CI 1648349220 +1100 reset: moving to HEAD~2 -308a85a7f740d42925175560337196f952ac6cf6 d450cc8f4e691e3043aac25ae71f0f1a3217368f CI 1648349220 +1100 commit: myfile4 conflict -d450cc8f4e691e3043aac25ae71f0f1a3217368f 702648e6efd5f8c60f5fe57e152850a5de756978 CI 1648349221 +1100 pull --no-edit: checkout 702648e6efd5f8c60f5fe57e152850a5de756978 -702648e6efd5f8c60f5fe57e152850a5de756978 bdd975a23140e915dd46a1a16575c71bcad754ca CI 1648349223 +1100 rebase: myfile4 conflict -bdd975a23140e915dd46a1a16575c71bcad754ca bdd975a23140e915dd46a1a16575c71bcad754ca CI 1648349223 +1100 rebase finished: returning to refs/heads/master diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index d538b98ff..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 0036ac0e5f5536f55bfdfcb4e09927f1eed3b37b CI 1648349220 +1100 commit (initial): myfile1 -0036ac0e5f5536f55bfdfcb4e09927f1eed3b37b 308a85a7f740d42925175560337196f952ac6cf6 CI 1648349220 +1100 commit: myfile2 -308a85a7f740d42925175560337196f952ac6cf6 ae0aa5a0d1c65005bd50012612b1c56c1ea06155 CI 1648349220 +1100 commit: myfile3 -ae0aa5a0d1c65005bd50012612b1c56c1ea06155 702648e6efd5f8c60f5fe57e152850a5de756978 CI 1648349220 +1100 commit: myfile4 -702648e6efd5f8c60f5fe57e152850a5de756978 308a85a7f740d42925175560337196f952ac6cf6 CI 1648349220 +1100 reset: moving to HEAD~2 -308a85a7f740d42925175560337196f952ac6cf6 d450cc8f4e691e3043aac25ae71f0f1a3217368f CI 1648349220 +1100 commit: myfile4 conflict -d450cc8f4e691e3043aac25ae71f0f1a3217368f bdd975a23140e915dd46a1a16575c71bcad754ca CI 1648349223 +1100 rebase finished: returning to refs/heads/master diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index db9c9657f..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 702648e6efd5f8c60f5fe57e152850a5de756978 CI 1648349220 +1100 fetch origin: storing head diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/00/36ac0e5f5536f55bfdfcb4e09927f1eed3b37b b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/00/36ac0e5f5536f55bfdfcb4e09927f1eed3b37b deleted file mode 100644 index 92dba726a..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/00/36ac0e5f5536f55bfdfcb4e09927f1eed3b37b +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@ѮsLJ)1P!ER#tyS5[˥m*`4df 9Tz%wuq8tY=CǃW"DwsO(˪~1P, \ No newline at end of file diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba..000000000 Binary files a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/30/8a85a7f740d42925175560337196f952ac6cf6 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/30/8a85a7f740d42925175560337196f952ac6cf6 deleted file mode 100644 index cf8b94a34..000000000 Binary files a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/30/8a85a7f740d42925175560337196f952ac6cf6 and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 deleted file mode 100644 index adf64119a..000000000 Binary files a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/70/2648e6efd5f8c60f5fe57e152850a5de756978 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/70/2648e6efd5f8c60f5fe57e152850a5de756978 deleted file mode 100644 index 04ef3447f..000000000 Binary files a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/70/2648e6efd5f8c60f5fe57e152850a5de756978 and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae deleted file mode 100644 index 13e3f581a..000000000 Binary files a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/ae/0aa5a0d1c65005bd50012612b1c56c1ea06155 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/ae/0aa5a0d1c65005bd50012612b1c56c1ea06155 deleted file mode 100644 index 8ebe82e5a..000000000 Binary files a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/ae/0aa5a0d1c65005bd50012612b1c56c1ea06155 and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 deleted file mode 100644 index 5a90eb5f9..000000000 Binary files a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 deleted file mode 100644 index ae05cad1e..000000000 Binary files a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/bd/d975a23140e915dd46a1a16575c71bcad754ca b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/bd/d975a23140e915dd46a1a16575c71bcad754ca deleted file mode 100644 index 32a1c9b2a..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/bd/d975a23140e915dd46a1a16575c71bcad754ca +++ /dev/null @@ -1,3 +0,0 @@ -x -0E]+d<@D誟1&,4M)½ܛZK̩3 - 6j)g3DbgQ޺ d,!9(X=+0G}vii%zjX JAǩtEee+Sʺ.= \ No newline at end of file diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/d4/50cc8f4e691e3043aac25ae71f0f1a3217368f b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/d4/50cc8f4e691e3043aac25ae71f0f1a3217368f deleted file mode 100644 index 2850a992e..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/d4/50cc8f4e691e3043aac25ae71f0f1a3217368f +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Ѯs e&L Rp11Q#ty[s9[+S]JHJHEbˑf=*H,`"\(ka#/[}Xd<%^Yϩ~˼de=W<[ \ No newline at end of file diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/e6/1e2c991de853082420fd27fd983098afd4c0c8 b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/e6/1e2c991de853082420fd27fd983098afd4c0c8 deleted file mode 100644 index 46f078cee..000000000 Binary files a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/e6/1e2c991de853082420fd27fd983098afd4c0c8 and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/e6/9912eb1649ce8dbb33678796cec3e89da3675d b/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/e6/9912eb1649ce8dbb33678796cec3e89da3675d deleted file mode 100644 index 9fa52a8fd..000000000 Binary files a/test/integration/pullRebaseConflict/expected/repo/.git_keep/objects/e6/9912eb1649ce8dbb33678796cec3e89da3675d and /dev/null differ diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/refs/heads/master b/test/integration/pullRebaseConflict/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 19ea48024..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -bdd975a23140e915dd46a1a16575c71bcad754ca diff --git a/test/integration/pullRebaseConflict/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pullRebaseConflict/expected/repo/.git_keep/refs/remotes/origin/master deleted file mode 100644 index af3d6e11d..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -702648e6efd5f8c60f5fe57e152850a5de756978 diff --git a/test/integration/pullRebaseConflict/expected/repo/myfile1 b/test/integration/pullRebaseConflict/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/pullRebaseConflict/expected/repo/myfile2 b/test/integration/pullRebaseConflict/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/pullRebaseConflict/expected/repo/myfile3 b/test/integration/pullRebaseConflict/expected/repo/myfile3 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/myfile3 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/pullRebaseConflict/expected/repo/myfile4 b/test/integration/pullRebaseConflict/expected/repo/myfile4 deleted file mode 100644 index 9b1719f5c..000000000 --- a/test/integration/pullRebaseConflict/expected/repo/myfile4 +++ /dev/null @@ -1 +0,0 @@ -conflict diff --git a/test/integration/pullRebaseConflict/recording.json b/test/integration/pullRebaseConflict/recording.json deleted file mode 100644 index 46a1e361f..000000000 --- a/test/integration/pullRebaseConflict/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":594,"Mod":0,"Key":256,"Ch":112},{"Timestamp":1378,"Mod":0,"Key":13,"Ch":13},{"Timestamp":1818,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2067,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2306,"Mod":0,"Key":256,"Ch":32},{"Timestamp":2810,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3562,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/pullRebaseConflict/setup.sh b/test/integration/pullRebaseConflict/setup.sh deleted file mode 100644 index 7360923fe..000000000 --- a/test/integration/pullRebaseConflict/setup.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -set -e - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -echo test1 > myfile1 -git add . -git commit -am "myfile1" -echo test2 > myfile2 -git add . -git commit -am "myfile2" -echo test3 > myfile3 -git add . -git commit -am "myfile3" -echo test4 > myfile4 -git add . -git commit -am "myfile4" - -cd .. -git clone --bare ./repo origin - -cd repo - -git reset --hard HEAD~2 - -echo conflict > myfile4 -git add . -git commit -am "myfile4 conflict" - -git remote add origin ../origin -git fetch origin -git branch --set-upstream-to=origin/master master - -git config pull.rebase true diff --git a/test/integration/pullRebaseConflict/test.json b/test/integration/pullRebaseConflict/test.json deleted file mode 100644 index 39ddf1e3d..000000000 --- a/test/integration/pullRebaseConflict/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "When user has configured pull with rebase, ensure we handle conflicts", "speed": 10 } diff --git a/test/integration/pullRebaseInteractive/expected/origin/HEAD b/test/integration/pullRebaseInteractive/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pullRebaseInteractive/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pullRebaseInteractive/expected/origin/config b/test/integration/pullRebaseInteractive/expected/origin/config deleted file mode 100644 index c10372133..000000000 --- a/test/integration/pullRebaseInteractive/expected/origin/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullRebaseInteractive/actual/./repo diff --git a/test/integration/pullRebaseInteractive/expected/origin/description b/test/integration/pullRebaseInteractive/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pullRebaseInteractive/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullRebaseInteractive/expected/origin/info/exclude b/test/integration/pullRebaseInteractive/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pullRebaseInteractive/expected/origin/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# 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 diff --git a/test/integration/pullRebaseInteractive/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebaseInteractive/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullRebaseInteractive/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullRebaseInteractive/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebaseInteractive/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/origin/objects/52/137603da2dccb618dfa0953d1b7df8c0255959 b/test/integration/pullRebaseInteractive/expected/origin/objects/52/137603da2dccb618dfa0953d1b7df8c0255959 deleted file mode 100644 index 41731f660..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/origin/objects/52/137603da2dccb618dfa0953d1b7df8c0255959 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/origin/objects/7c/0506ec2cd7852818e3e597619ff64af83770c6 b/test/integration/pullRebaseInteractive/expected/origin/objects/7c/0506ec2cd7852818e3e597619ff64af83770c6 deleted file mode 100644 index bf8c283f0..000000000 --- a/test/integration/pullRebaseInteractive/expected/origin/objects/7c/0506ec2cd7852818e3e597619ff64af83770c6 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0@ѮsJ&cR -<ƘL#tyS5[ S0jDs XZLER۫0p~Mo)v4;9i'w-~3, \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected/origin/objects/91/d2303b08e6765e0ec38c401ecbab0cbb126dca b/test/integration/pullRebaseInteractive/expected/origin/objects/91/d2303b08e6765e0ec38c401ecbab0cbb126dca deleted file mode 100644 index d3ebd3660..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/origin/objects/91/d2303b08e6765e0ec38c401ecbab0cbb126dca and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullRebaseInteractive/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullRebaseInteractive/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullRebaseInteractive/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/origin/objects/d4/3a810e4d47f2c632ea62ae581a8aade6f23b21 b/test/integration/pullRebaseInteractive/expected/origin/objects/d4/3a810e4d47f2c632ea62ae581a8aade6f23b21 deleted file mode 100644 index 8d51321bd..000000000 --- a/test/integration/pullRebaseInteractive/expected/origin/objects/d4/3a810e4d47f2c632ea62ae581a8aade6f23b21 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0@Q9Ed&Dzd:łD#׵֥yv3f!%`J3rA2ENS{t[|S ɤh`JIдZ -4nuxO.֛GDzL5J9? \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullRebaseInteractive/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/origin/packed-refs b/test/integration/pullRebaseInteractive/expected/origin/packed-refs deleted file mode 100644 index 6060b6bc3..000000000 --- a/test/integration/pullRebaseInteractive/expected/origin/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -d43a810e4d47f2c632ea62ae581a8aade6f23b21 refs/heads/master diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index f09f5548b..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1,16 +0,0 @@ -myfile4 conflict - -# Please enter the commit message for your changes. Lines starting -# with '#' will be ignored, and an empty message aborts the commit. -# -# interactive rebase in progress; onto d43a810 -# Last command done (1 command done): -# pick e974f4a myfile4 conflict -# Next commands to do (3 remaining commands): -# pick d217625 5 -# pick 09f87d1 6 -# You are currently rebasing branch 'master' on 'd43a810'. -# -# Changes to be committed: -# modified: myfile4 -# diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/FETCH_HEAD b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index 5b1cee8fc..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -d43a810e4d47f2c632ea62ae581a8aade6f23b21 branch 'master' of ../origin diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/HEAD b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/ORIG_HEAD b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 3bcbef789..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -e974f4acf07db6fcaa438df552a8fd44e2d58dcd diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/config b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/config deleted file mode 100644 index 6dc2c0ed8..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/config +++ /dev/null @@ -1,18 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[remote "origin"] - url = ../origin - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master -[pull] - rebase = interactive diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/description b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/index b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/index deleted file mode 100644 index 531e6a734..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/info/exclude b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# 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 diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/HEAD b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 610710e3e..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,15 +0,0 @@ -0000000000000000000000000000000000000000 7c0506ec2cd7852818e3e597619ff64af83770c6 CI 1648349245 +1100 commit (initial): myfile1 -7c0506ec2cd7852818e3e597619ff64af83770c6 52137603da2dccb618dfa0953d1b7df8c0255959 CI 1648349245 +1100 commit: myfile2 -52137603da2dccb618dfa0953d1b7df8c0255959 91d2303b08e6765e0ec38c401ecbab0cbb126dca CI 1648349245 +1100 commit: myfile3 -91d2303b08e6765e0ec38c401ecbab0cbb126dca d43a810e4d47f2c632ea62ae581a8aade6f23b21 CI 1648349245 +1100 commit: myfile4 -d43a810e4d47f2c632ea62ae581a8aade6f23b21 52137603da2dccb618dfa0953d1b7df8c0255959 CI 1648349245 +1100 reset: moving to HEAD~2 -52137603da2dccb618dfa0953d1b7df8c0255959 e974f4acf07db6fcaa438df552a8fd44e2d58dcd CI 1648349245 +1100 commit: myfile4 conflict -e974f4acf07db6fcaa438df552a8fd44e2d58dcd d217625c37713436bb6c92ff9d0b3991a8a7dba5 CI 1648349245 +1100 commit: 5 -d217625c37713436bb6c92ff9d0b3991a8a7dba5 09f87d11c514ba0a54e43193aaf9067174e2315e CI 1648349245 +1100 commit: 6 -09f87d11c514ba0a54e43193aaf9067174e2315e 2e0409bb60df3c4587245fd01fdeb270bb5a24f3 CI 1648349245 +1100 commit: 7 -2e0409bb60df3c4587245fd01fdeb270bb5a24f3 d43a810e4d47f2c632ea62ae581a8aade6f23b21 CI 1648349247 +1100 rebase -i (start): checkout d43a810e4d47f2c632ea62ae581a8aade6f23b21 -d43a810e4d47f2c632ea62ae581a8aade6f23b21 66d3639353f039f2b87ea3e0dd3db13a5415c6df CI 1648349249 +1100 rebase -i (continue): myfile4 conflict -66d3639353f039f2b87ea3e0dd3db13a5415c6df 5c4dd6c94fae2afe48f413f48dc998ae48fcf463 CI 1648349249 +1100 rebase -i (pick): 5 -5c4dd6c94fae2afe48f413f48dc998ae48fcf463 ff0d57cafe9d745264b23450e9268cdb5ddc4edc CI 1648349249 +1100 rebase -i (pick): 6 -ff0d57cafe9d745264b23450e9268cdb5ddc4edc 416178fd7462af72f4357dda1241fc66063e467b CI 1648349249 +1100 rebase -i (pick): 7 -416178fd7462af72f4357dda1241fc66063e467b 416178fd7462af72f4357dda1241fc66063e467b CI 1648349249 +1100 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 8f16c1e9c..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,10 +0,0 @@ -0000000000000000000000000000000000000000 7c0506ec2cd7852818e3e597619ff64af83770c6 CI 1648349245 +1100 commit (initial): myfile1 -7c0506ec2cd7852818e3e597619ff64af83770c6 52137603da2dccb618dfa0953d1b7df8c0255959 CI 1648349245 +1100 commit: myfile2 -52137603da2dccb618dfa0953d1b7df8c0255959 91d2303b08e6765e0ec38c401ecbab0cbb126dca CI 1648349245 +1100 commit: myfile3 -91d2303b08e6765e0ec38c401ecbab0cbb126dca d43a810e4d47f2c632ea62ae581a8aade6f23b21 CI 1648349245 +1100 commit: myfile4 -d43a810e4d47f2c632ea62ae581a8aade6f23b21 52137603da2dccb618dfa0953d1b7df8c0255959 CI 1648349245 +1100 reset: moving to HEAD~2 -52137603da2dccb618dfa0953d1b7df8c0255959 e974f4acf07db6fcaa438df552a8fd44e2d58dcd CI 1648349245 +1100 commit: myfile4 conflict -e974f4acf07db6fcaa438df552a8fd44e2d58dcd d217625c37713436bb6c92ff9d0b3991a8a7dba5 CI 1648349245 +1100 commit: 5 -d217625c37713436bb6c92ff9d0b3991a8a7dba5 09f87d11c514ba0a54e43193aaf9067174e2315e CI 1648349245 +1100 commit: 6 -09f87d11c514ba0a54e43193aaf9067174e2315e 2e0409bb60df3c4587245fd01fdeb270bb5a24f3 CI 1648349245 +1100 commit: 7 -2e0409bb60df3c4587245fd01fdeb270bb5a24f3 416178fd7462af72f4357dda1241fc66063e467b CI 1648349249 +1100 rebase -i (finish): refs/heads/master onto d43a810e4d47f2c632ea62ae581a8aade6f23b21 diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index fdad392f4..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 d43a810e4d47f2c632ea62ae581a8aade6f23b21 CI 1648349245 +1100 fetch origin: storing head diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/00/a0b67048be84a6aeaa50b27ad90ab567d65837 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/00/a0b67048be84a6aeaa50b27ad90ab567d65837 deleted file mode 100644 index 48767aa88..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/00/a0b67048be84a6aeaa50b27ad90ab567d65837 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/03/5fa6a8b921a1d593845c5ce81434b92cc0eccb b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/03/5fa6a8b921a1d593845c5ce81434b92cc0eccb deleted file mode 100644 index ce54059d4..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/03/5fa6a8b921a1d593845c5ce81434b92cc0eccb and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/09/f87d11c514ba0a54e43193aaf9067174e2315e b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/09/f87d11c514ba0a54e43193aaf9067174e2315e deleted file mode 100644 index c3702e14a..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/09/f87d11c514ba0a54e43193aaf9067174e2315e and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/24/21815f8570a34d9f8c8991df1005150ed3ae99 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/24/21815f8570a34d9f8c8991df1005150ed3ae99 deleted file mode 100644 index 4df0a731d..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/24/21815f8570a34d9f8c8991df1005150ed3ae99 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/2e/0409bb60df3c4587245fd01fdeb270bb5a24f3 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/2e/0409bb60df3c4587245fd01fdeb270bb5a24f3 deleted file mode 100644 index 1d9689812..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/2e/0409bb60df3c4587245fd01fdeb270bb5a24f3 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/41/6178fd7462af72f4357dda1241fc66063e467b b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/41/6178fd7462af72f4357dda1241fc66063e467b deleted file mode 100644 index 3744a685d..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/41/6178fd7462af72f4357dda1241fc66063e467b and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/52/137603da2dccb618dfa0953d1b7df8c0255959 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/52/137603da2dccb618dfa0953d1b7df8c0255959 deleted file mode 100644 index 41731f660..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/52/137603da2dccb618dfa0953d1b7df8c0255959 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/5c/4dd6c94fae2afe48f413f48dc998ae48fcf463 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/5c/4dd6c94fae2afe48f413f48dc998ae48fcf463 deleted file mode 100644 index 053e1cb24..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/5c/4dd6c94fae2afe48f413f48dc998ae48fcf463 +++ /dev/null @@ -1,2 +0,0 @@ -x1 -1@Q" L&N@Dj1I&(wY"x|◥ǰ06U g%/1BR3{*, }KlV5l#&$lgTkv(X/f{~O=_1$0{ݧ /8 \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/5d/0d8eb2623180ca95f2634f7e25f40521d5aea2 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/5d/0d8eb2623180ca95f2634f7e25f40521d5aea2 deleted file mode 100644 index 7fc19f59c..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/5d/0d8eb2623180ca95f2634f7e25f40521d5aea2 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/66/d3639353f039f2b87ea3e0dd3db13a5415c6df b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/66/d3639353f039f2b87ea3e0dd3db13a5415c6df deleted file mode 100644 index 534bfc387..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/66/d3639353f039f2b87ea3e0dd3db13a5415c6df and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/7c/0506ec2cd7852818e3e597619ff64af83770c6 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/7c/0506ec2cd7852818e3e597619ff64af83770c6 deleted file mode 100644 index bf8c283f0..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/7c/0506ec2cd7852818e3e597619ff64af83770c6 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0@ѮsJ&cR -<ƘL#tyS5[ S0jDs XZLER۫0p~Mo)v4;9i'w-~3, \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/8c/fc761d2799512553e491f7ceb3564a5e994999 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/8c/fc761d2799512553e491f7ceb3564a5e994999 deleted file mode 100644 index 8baacd0cc..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/8c/fc761d2799512553e491f7ceb3564a5e994999 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/91/d2303b08e6765e0ec38c401ecbab0cbb126dca b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/91/d2303b08e6765e0ec38c401ecbab0cbb126dca deleted file mode 100644 index d3ebd3660..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/91/d2303b08e6765e0ec38c401ecbab0cbb126dca and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae deleted file mode 100644 index 13e3f581a..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/9b/1719f5cf069568785080a0bbabbe7c377e22ae and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 deleted file mode 100644 index 4667dcf6f..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/9d/aeafb9864cf43055ae93beb0afd6c7d144bfa4 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 deleted file mode 100644 index 5a90eb5f9..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/ae/d6c0a012c68a8b615ab0185b64f59c414d4746 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 deleted file mode 100644 index ae05cad1e..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/b2/da3d615a1805f094849247add77d09aee06451 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d2/17625c37713436bb6c92ff9d0b3991a8a7dba5 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d2/17625c37713436bb6c92ff9d0b3991a8a7dba5 deleted file mode 100644 index 96116a717..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d2/17625c37713436bb6c92ff9d0b3991a8a7dba5 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d4/3a810e4d47f2c632ea62ae581a8aade6f23b21 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d4/3a810e4d47f2c632ea62ae581a8aade6f23b21 deleted file mode 100644 index 8d51321bd..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d4/3a810e4d47f2c632ea62ae581a8aade6f23b21 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0@Q9Ed&Dzd:łD#׵֥yv3f!%`J3rA2ENS{t[|S ɤh`JIдZ -4nuxO.֛GDzL5J9? \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d4/8cf11b7fbbda4199b736bb9e8fadabf773eb9e b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d4/8cf11b7fbbda4199b736bb9e8fadabf773eb9e deleted file mode 100644 index d63c59fb0..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/d4/8cf11b7fbbda4199b736bb9e8fadabf773eb9e and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/e9/74f4acf07db6fcaa438df552a8fd44e2d58dcd b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/e9/74f4acf07db6fcaa438df552a8fd44e2d58dcd deleted file mode 100644 index dc8909137..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/e9/74f4acf07db6fcaa438df552a8fd44e2d58dcd and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/f0/bbe52a52883609acdb825c8af32b4b3ccb0607 b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/f0/bbe52a52883609acdb825c8af32b4b3ccb0607 deleted file mode 100644 index b0b5fcfd9..000000000 Binary files a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/f0/bbe52a52883609acdb825c8af32b4b3ccb0607 and /dev/null differ diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/ff/0d57cafe9d745264b23450e9268cdb5ddc4edc b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/ff/0d57cafe9d745264b23450e9268cdb5ddc4edc deleted file mode 100644 index e278bfbe8..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/objects/ff/0d57cafe9d745264b23450e9268cdb5ddc4edc +++ /dev/null @@ -1,2 +0,0 @@ -xA -1 E] ҴiM@Dmuw.u><ƪ#F F$acJ BȐ$Y9|Z&!LjX׸ͫ4]/j7 \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/refs/heads/master b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 99eb1dca1..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -416178fd7462af72f4357dda1241fc66063e467b diff --git a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pullRebaseInteractive/expected/repo/.git_keep/refs/remotes/origin/master deleted file mode 100644 index 6a52d4f85..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -d43a810e4d47f2c632ea62ae581a8aade6f23b21 diff --git a/test/integration/pullRebaseInteractive/expected/repo/myfile1 b/test/integration/pullRebaseInteractive/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/pullRebaseInteractive/expected/repo/myfile2 b/test/integration/pullRebaseInteractive/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/pullRebaseInteractive/expected/repo/myfile3 b/test/integration/pullRebaseInteractive/expected/repo/myfile3 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/myfile3 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/pullRebaseInteractive/expected/repo/myfile4 b/test/integration/pullRebaseInteractive/expected/repo/myfile4 deleted file mode 100644 index 9b1719f5c..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/myfile4 +++ /dev/null @@ -1 +0,0 @@ -conflict diff --git a/test/integration/pullRebaseInteractive/expected/repo/myfile5 b/test/integration/pullRebaseInteractive/expected/repo/myfile5 deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/myfile5 +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/pullRebaseInteractive/expected/repo/myfile6 b/test/integration/pullRebaseInteractive/expected/repo/myfile6 deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/myfile6 +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/pullRebaseInteractive/expected/repo/myfile7 b/test/integration/pullRebaseInteractive/expected/repo/myfile7 deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/pullRebaseInteractive/expected/repo/myfile7 +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/pullRebaseInteractive/recording.json b/test/integration/pullRebaseInteractive/recording.json deleted file mode 100644 index dee2e4d8b..000000000 --- a/test/integration/pullRebaseInteractive/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":1280,"Mod":0,"Key":256,"Ch":112},{"Timestamp":2032,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2392,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2640,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2896,"Mod":0,"Key":256,"Ch":32},{"Timestamp":3384,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4158,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/pullRebaseInteractive/setup.sh b/test/integration/pullRebaseInteractive/setup.sh deleted file mode 100644 index fc90cd285..000000000 --- a/test/integration/pullRebaseInteractive/setup.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh - -set -e - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -echo test1 > myfile1 -git add . -git commit -am "myfile1" -echo test2 > myfile2 -git add . -git commit -am "myfile2" -echo test3 > myfile3 -git add . -git commit -am "myfile3" -echo test4 > myfile4 -git add . -git commit -am "myfile4" - -cd .. -git clone --bare ./repo origin - -cd repo - -git reset --hard HEAD~2 - -echo conflict > myfile4 -git add . -git commit -am "myfile4 conflict" - -echo test > myfile5 -git add . -git commit -am "5" - -echo test > myfile6 -git add . -git commit -am "6" - -echo test > myfile7 -git add . -git commit -am "7" - -git remote add origin ../origin -git fetch origin -git branch --set-upstream-to=origin/master master - -git config pull.rebase interactive diff --git a/test/integration/pullRebaseInteractive/test.json b/test/integration/pullRebaseInteractive/test.json deleted file mode 100644 index 7eb652fa1..000000000 --- a/test/integration/pullRebaseInteractive/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "When user has configured pull with interactive rebase, ensure we handle conflicts", "speed": 5 } diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/HEAD b/test/integration/pullRebaseInteractiveWithDrop/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/config b/test/integration/pullRebaseInteractiveWithDrop/expected/origin/config deleted file mode 100644 index 73340e39e..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true - ignorecase = true - precomposeunicode = true -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullRebaseInteractiveWithDrop/actual/./repo diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/description b/test/integration/pullRebaseInteractiveWithDrop/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/info/exclude b/test/integration/pullRebaseInteractiveWithDrop/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/info/exclude +++ /dev/null @@ -1,7 +0,0 @@ -# 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 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba..000000000 Binary files a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 and /dev/null differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/6e/44f128bc1b25454eeb074e40dd15d02eff5c87 b/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/6e/44f128bc1b25454eeb074e40dd15d02eff5c87 deleted file mode 100644 index d30bb28d3..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/origin/objects/6e/44f128bc1b25454eeb074e40dd15d02eff5c87 +++ /dev/null @@ -1,3 +0,0 @@ -xK -0@] L~ "tcL,[J=xumm -.b k0+!* 1648349271 +1100 commit (initial): myfile1 -fefea9e2c324080a61d03142554b81e410e9c87f a888f490faa49a665557b35171f4ce0896414ea2 CI 1648349271 +1100 commit: myfile2 -a888f490faa49a665557b35171f4ce0896414ea2 6e44f128bc1b25454eeb074e40dd15d02eff5c87 CI 1648349271 +1100 commit: myfile3 -6e44f128bc1b25454eeb074e40dd15d02eff5c87 ce137eabb7b8df81d4818ac8a16892b1f7327219 CI 1648349271 +1100 commit: myfile4 -ce137eabb7b8df81d4818ac8a16892b1f7327219 a888f490faa49a665557b35171f4ce0896414ea2 CI 1648349271 +1100 reset: moving to HEAD~2 -a888f490faa49a665557b35171f4ce0896414ea2 6ba64def9b38eb7bcf5aa1a6c513c490967062ad CI 1648349271 +1100 commit: myfile4 conflict -6ba64def9b38eb7bcf5aa1a6c513c490967062ad 6226d76652e77aba63c55f4f48344304f4f75879 CI 1648349271 +1100 commit: 5 -6226d76652e77aba63c55f4f48344304f4f75879 67c00631fc73b6b4d61a1dcb0195777f0d832fd7 CI 1648349271 +1100 commit: 6 -67c00631fc73b6b4d61a1dcb0195777f0d832fd7 3c2846a93bb9c2815e3218ac3c906da26d159068 CI 1648349271 +1100 commit: 7 -3c2846a93bb9c2815e3218ac3c906da26d159068 ce137eabb7b8df81d4818ac8a16892b1f7327219 CI 1648349273 +1100 rebase -i (start): checkout ce137eabb7b8df81d4818ac8a16892b1f7327219 -ce137eabb7b8df81d4818ac8a16892b1f7327219 281c7e805fd7bf133611e701ef01f0a4f362f232 CI 1648349278 +1100 rebase -i (continue): myfile4 conflict -281c7e805fd7bf133611e701ef01f0a4f362f232 d13fd4cd73174c7048108d2dc8d277a8e013d1e4 CI 1648349278 +1100 rebase -i (pick): 5 -d13fd4cd73174c7048108d2dc8d277a8e013d1e4 72da3b902dcd9e99b21bdc36891e028b8dbfb219 CI 1648349278 +1100 rebase -i (pick): 7 -72da3b902dcd9e99b21bdc36891e028b8dbfb219 72da3b902dcd9e99b21bdc36891e028b8dbfb219 CI 1648349278 +1100 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 816678825..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,10 +0,0 @@ -0000000000000000000000000000000000000000 fefea9e2c324080a61d03142554b81e410e9c87f CI 1648349271 +1100 commit (initial): myfile1 -fefea9e2c324080a61d03142554b81e410e9c87f a888f490faa49a665557b35171f4ce0896414ea2 CI 1648349271 +1100 commit: myfile2 -a888f490faa49a665557b35171f4ce0896414ea2 6e44f128bc1b25454eeb074e40dd15d02eff5c87 CI 1648349271 +1100 commit: myfile3 -6e44f128bc1b25454eeb074e40dd15d02eff5c87 ce137eabb7b8df81d4818ac8a16892b1f7327219 CI 1648349271 +1100 commit: myfile4 -ce137eabb7b8df81d4818ac8a16892b1f7327219 a888f490faa49a665557b35171f4ce0896414ea2 CI 1648349271 +1100 reset: moving to HEAD~2 -a888f490faa49a665557b35171f4ce0896414ea2 6ba64def9b38eb7bcf5aa1a6c513c490967062ad CI 1648349271 +1100 commit: myfile4 conflict -6ba64def9b38eb7bcf5aa1a6c513c490967062ad 6226d76652e77aba63c55f4f48344304f4f75879 CI 1648349271 +1100 commit: 5 -6226d76652e77aba63c55f4f48344304f4f75879 67c00631fc73b6b4d61a1dcb0195777f0d832fd7 CI 1648349271 +1100 commit: 6 -67c00631fc73b6b4d61a1dcb0195777f0d832fd7 3c2846a93bb9c2815e3218ac3c906da26d159068 CI 1648349271 +1100 commit: 7 -3c2846a93bb9c2815e3218ac3c906da26d159068 72da3b902dcd9e99b21bdc36891e028b8dbfb219 CI 1648349278 +1100 rebase -i (finish): refs/heads/master onto ce137eabb7b8df81d4818ac8a16892b1f7327219 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index b4fbeb7a0..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 ce137eabb7b8df81d4818ac8a16892b1f7327219 CI 1648349271 +1100 fetch origin: storing head diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/00/a0b67048be84a6aeaa50b27ad90ab567d65837 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/00/a0b67048be84a6aeaa50b27ad90ab567d65837 deleted file mode 100644 index 48767aa88..000000000 Binary files a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/00/a0b67048be84a6aeaa50b27ad90ab567d65837 and /dev/null differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/26/02a2a5727666c205fef7f152786e1edb1c5d4b b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/26/02a2a5727666c205fef7f152786e1edb1c5d4b deleted file mode 100644 index 90bf4a139..000000000 Binary files a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/26/02a2a5727666c205fef7f152786e1edb1c5d4b and /dev/null differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/28/1c7e805fd7bf133611e701ef01f0a4f362f232 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/28/1c7e805fd7bf133611e701ef01f0a4f362f232 deleted file mode 100644 index 01b717854..000000000 Binary files a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/28/1c7e805fd7bf133611e701ef01f0a4f362f232 and /dev/null differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba..000000000 Binary files a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 and /dev/null differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/32/2d2d5205fe70df6899f8d58474941de4798aab b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/32/2d2d5205fe70df6899f8d58474941de4798aab deleted file mode 100644 index 8a1d879aa..000000000 Binary files a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/32/2d2d5205fe70df6899f8d58474941de4798aab and /dev/null differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/3c/2846a93bb9c2815e3218ac3c906da26d159068 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/3c/2846a93bb9c2815e3218ac3c906da26d159068 deleted file mode 100644 index 3622a8add..000000000 Binary files a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/3c/2846a93bb9c2815e3218ac3c906da26d159068 and /dev/null differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/5d/0d8eb2623180ca95f2634f7e25f40521d5aea2 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/5d/0d8eb2623180ca95f2634f7e25f40521d5aea2 deleted file mode 100644 index 7fc19f59c..000000000 Binary files a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/5d/0d8eb2623180ca95f2634f7e25f40521d5aea2 and /dev/null differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/62/26d76652e77aba63c55f4f48344304f4f75879 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/62/26d76652e77aba63c55f4f48344304f4f75879 deleted file mode 100644 index 88e06fe16..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/62/26d76652e77aba63c55f4f48344304f4f75879 +++ /dev/null @@ -1,4 +0,0 @@ -x -0=+rd$Do- -֖ϷuvuŲRfCgA&8H \ No newline at end of file diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/67/c00631fc73b6b4d61a1dcb0195777f0d832fd7 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/67/c00631fc73b6b4d61a1dcb0195777f0d832fd7 deleted file mode 100644 index 6282c8a0f..000000000 Binary files a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/67/c00631fc73b6b4d61a1dcb0195777f0d832fd7 and /dev/null differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/6b/a64def9b38eb7bcf5aa1a6c513c490967062ad b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/6b/a64def9b38eb7bcf5aa1a6c513c490967062ad deleted file mode 100644 index b23522e37..000000000 Binary files a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/6b/a64def9b38eb7bcf5aa1a6c513c490967062ad and /dev/null differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/6e/44f128bc1b25454eeb074e40dd15d02eff5c87 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/6e/44f128bc1b25454eeb074e40dd15d02eff5c87 deleted file mode 100644 index d30bb28d3..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/6e/44f128bc1b25454eeb074e40dd15d02eff5c87 +++ /dev/null @@ -1,3 +0,0 @@ -xK -0@] L~ "tcL,[J=xumm -.b k0+!* FR3v73( -~)m/mG(r蛪7U#H"\TbbL5TnBֲ{lYM2'D̀j%'2br_2O=ezLA8)?"S]pqZ7 \ No newline at end of file diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/f0/bbe52a52883609acdb825c8af32b4b3ccb0607 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/f0/bbe52a52883609acdb825c8af32b4b3ccb0607 deleted file mode 100644 index b0b5fcfd9..000000000 Binary files a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/f0/bbe52a52883609acdb825c8af32b4b3ccb0607 and /dev/null differ diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/fe/fea9e2c324080a61d03142554b81e410e9c87f b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/fe/fea9e2c324080a61d03142554b81e410e9c87f deleted file mode 100644 index 8493481ba..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/objects/fe/fea9e2c324080a61d03142554b81e410e9c87f +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9ɤ$cL!R"~H|*x\GMH1qIkT%_wnЏkKnvdJ!"wG=&]ξu3@, \ No newline at end of file diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/refs/heads/master b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 388a5b886..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -72da3b902dcd9e99b21bdc36891e028b8dbfb219 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/refs/remotes/origin/master deleted file mode 100644 index a350da945..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -ce137eabb7b8df81d4818ac8a16892b1f7327219 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile1 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile2 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile3 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile3 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile3 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile4 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile4 deleted file mode 100644 index 9b1719f5c..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile4 +++ /dev/null @@ -1 +0,0 @@ -conflict diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile5 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile5 deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile5 +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile7 b/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile7 deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/expected/repo/myfile7 +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/pullRebaseInteractiveWithDrop/recording.json b/test/integration/pullRebaseInteractiveWithDrop/recording.json deleted file mode 100644 index 9c1f842cb..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":1430,"Mod":0,"Key":256,"Ch":112},{"Timestamp":2247,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2630,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2886,"Mod":0,"Key":259,"Ch":0},{"Timestamp":3175,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3599,"Mod":0,"Key":256,"Ch":100},{"Timestamp":4357,"Mod":0,"Key":260,"Ch":0},{"Timestamp":4630,"Mod":0,"Key":260,"Ch":0},{"Timestamp":4983,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5214,"Mod":0,"Key":258,"Ch":0},{"Timestamp":5470,"Mod":0,"Key":256,"Ch":32},{"Timestamp":5989,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6838,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/pullRebaseInteractiveWithDrop/setup.sh b/test/integration/pullRebaseInteractiveWithDrop/setup.sh deleted file mode 100644 index fc90cd285..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/setup.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh - -set -e - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -echo test1 > myfile1 -git add . -git commit -am "myfile1" -echo test2 > myfile2 -git add . -git commit -am "myfile2" -echo test3 > myfile3 -git add . -git commit -am "myfile3" -echo test4 > myfile4 -git add . -git commit -am "myfile4" - -cd .. -git clone --bare ./repo origin - -cd repo - -git reset --hard HEAD~2 - -echo conflict > myfile4 -git add . -git commit -am "myfile4 conflict" - -echo test > myfile5 -git add . -git commit -am "5" - -echo test > myfile6 -git add . -git commit -am "6" - -echo test > myfile7 -git add . -git commit -am "7" - -git remote add origin ../origin -git fetch origin -git branch --set-upstream-to=origin/master master - -git config pull.rebase interactive diff --git a/test/integration/pullRebaseInteractiveWithDrop/test.json b/test/integration/pullRebaseInteractiveWithDrop/test.json deleted file mode 100644 index 6f85ff5b7..000000000 --- a/test/integration/pullRebaseInteractiveWithDrop/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "When user has configured pull with interactive rebase, ensure we handle conflicts and show commits yet to be rebased", "speed": 5 }