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/components/prompt_driver.go b/pkg/integration/components/prompt_driver.go index 45a6db513..59e3587ef 100644 --- a/pkg/integration/components/prompt_driver.go +++ b/pkg/integration/components/prompt_driver.go @@ -32,8 +32,7 @@ func (self *PromptDriver) Type(value string) *PromptDriver { } func (self *PromptDriver) Clear() *PromptDriver { - // TODO: soft-code this - self.t.press("") + self.t.press(ClearKey) return self } diff --git a/pkg/integration/components/search_driver.go b/pkg/integration/components/search_driver.go new file mode 100644 index 000000000..4ab4a4103 --- /dev/null +++ b/pkg/integration/components/search_driver.go @@ -0,0 +1,39 @@ +package components + +// TODO: soft-code this +const ClearKey = "" + +type SearchDriver struct { + t *TestDriver +} + +func (self *SearchDriver) getViewDriver() *ViewDriver { + return self.t.Views().Search() +} + +// asserts on the text initially present in the prompt +func (self *SearchDriver) InitialText(expected *matcher) *SearchDriver { + self.getViewDriver().Content(expected) + + return self +} + +func (self *SearchDriver) Type(value string) *SearchDriver { + self.t.typeContent(value) + + return self +} + +func (self *SearchDriver) Clear() *SearchDriver { + self.t.press(ClearKey) + + return self +} + +func (self *SearchDriver) Confirm() { + self.getViewDriver().PressEnter() +} + +func (self *SearchDriver) Cancel() { + self.getViewDriver().PressEscape() +} diff --git a/pkg/integration/components/shell.go b/pkg/integration/components/shell.go index 2087cd389..8d47083ad 100644 --- a/pkg/integration/components/shell.go +++ b/pkg/integration/components/shell.go @@ -179,7 +179,7 @@ func (self *Shell) StashWithMessage(message string) *Shell { } func (self *Shell) SetConfig(key string, value string) *Shell { - self.RunCommand(fmt.Sprintf(`git config --local "%s" %s`, key, value)) + self.RunCommand(fmt.Sprintf(`git config --local "%s" "%s"`, key, value)) return self } diff --git a/pkg/integration/components/test_driver.go b/pkg/integration/components/test_driver.go index 1128de3f5..e52cc8915 100644 --- a/pkg/integration/components/test_driver.go +++ b/pkg/integration/components/test_driver.go @@ -159,6 +159,19 @@ func (self *TestDriver) ExpectClipboard(matcher *matcher) { }) } +func (self *TestDriver) ExpectSearch() *SearchDriver { + self.inSearch() + + return &SearchDriver{t: self} +} + +func (self *TestDriver) inSearch() { + self.assertWithRetries(func() (bool, string) { + currentView := self.gui.CurrentContext().GetView() + return currentView.Name() == "search", "Expected search prompt to be focused" + }) +} + // for making assertions through git itself func (self *TestDriver) Git() *Git { return &Git{assertionHelper: self.assertionHelper, shell: self.shell} diff --git a/pkg/integration/components/views.go b/pkg/integration/components/views.go index 4c8002469..ea5257602 100644 --- a/pkg/integration/components/views.go +++ b/pkg/integration/components/views.go @@ -127,3 +127,7 @@ func (self *Views) Suggestions() *ViewDriver { func (self *Views) MergeConflicts() *ViewDriver { return self.byName("mergeConflicts") } + +func (self *Views) Search() *ViewDriver { + return self.byName("search") +} 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/branch/reset_upstream.go b/pkg/integration/tests/branch/reset_upstream.go new file mode 100644 index 000000000..126d2abf9 --- /dev/null +++ b/pkg/integration/tests/branch/reset_upstream.go @@ -0,0 +1,36 @@ +package branch + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var ResetUpstream = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Reset the upstream of a branch", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + shell.CloneIntoRemote("origin") + shell.SetBranchUpstream("master", "origin/master") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Branches(). + Focus(). + Press(keys.Universal.NextScreenMode). // we need to enlargen the window to see the upstream + Lines( + Contains("master").Contains("origin master").IsSelected(), + ). + Press(keys.Branches.SetUpstream). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Equals("Set/unset upstream")). + Select(Contains("unset upstream of selected branch")). + Confirm() + }). + Lines( + Contains("master").DoesNotContain("origin master").IsSelected(), + ) + }, +}) diff --git a/pkg/integration/tests/branch/set_upstream.go b/pkg/integration/tests/branch/set_upstream.go new file mode 100644 index 000000000..3388a6086 --- /dev/null +++ b/pkg/integration/tests/branch/set_upstream.go @@ -0,0 +1,40 @@ +package branch + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var SetUpstream = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Set the upstream of a branch", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + shell.CloneIntoRemote("origin") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Branches(). + Focus(). + Press(keys.Universal.NextScreenMode). // we need to enlargen the window to see the upstream + Lines( + Contains("master").DoesNotContain("origin master").IsSelected(), + ). + Press(keys.Branches.SetUpstream). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Equals("Set/unset upstream")). + Select(Contains(" set upstream of selected branch")). // using leading space to disambiguate from the 'reset' option + Confirm() + + t.ExpectPopup().Prompt(). + Title(Equals("Enter upstream as ' '")). + SuggestionLines(Equals("origin master")). + ConfirmFirstSuggestion() + }). + Lines( + Contains("master").Contains("origin master").IsSelected(), + ) + }, +}) diff --git a/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go index df9988c2a..3e82de065 100644 --- a/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go +++ b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go @@ -47,13 +47,13 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{ ). Press(keys.Commits.PasteCommits) - t.ExpectPopup().Alert().Title(Equals("Cherry-Pick")).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!")). + t.ExpectPopup().Alert(). + Title(Equals("Cherry-Pick")). + Content(Contains("Are you sure you want to cherry-pick the copied commits onto this branch?")). Confirm() + t.Actions().AcknowledgeConflicts() + t.Views().Files(). IsFocused(). SelectedLine(Contains("file")). @@ -65,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/commit/reset_author.go b/pkg/integration/tests/commit/reset_author.go new file mode 100644 index 000000000..f54b5b5aa --- /dev/null +++ b/pkg/integration/tests/commit/reset_author.go @@ -0,0 +1,39 @@ +package commit + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var ResetAuthor = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Reset author on a commit", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.SetConfig("user.email", "Bill@example.com") + shell.SetConfig("user.name", "Bill Smith") + + shell.EmptyCommit("one") + + shell.SetConfig("user.email", "John@example.com") + shell.SetConfig("user.name", "John Smith") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Lines( + Contains("BS").Contains("one").IsSelected(), + ). + Press(keys.Commits.ResetCommitAuthor). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Equals("Amend commit attribute")). + Select(Contains("reset author")). + Confirm() + }). + Lines( + Contains("JS").Contains("one").IsSelected(), + ) + }, +}) diff --git a/pkg/integration/tests/commit/search.go b/pkg/integration/tests/commit/search.go new file mode 100644 index 000000000..7159b11d1 --- /dev/null +++ b/pkg/integration/tests/commit/search.go @@ -0,0 +1,107 @@ +package commit + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var Search = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Search for a commit", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + shell.EmptyCommit("two") + shell.EmptyCommit("three") + shell.EmptyCommit("four") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Lines( + Contains("four").IsSelected(), + Contains("three"), + Contains("two"), + Contains("one"), + ). + Press(keys.Universal.StartSearch). + Tap(func() { + t.ExpectSearch(). + Type("two"). + Confirm() + + t.Views().Search().Content(Contains("matches for 'two' (1 of 1)")) + }). + Lines( + Contains("four"), + Contains("three"), + Contains("two").IsSelected(), + Contains("one"), + ). + Press(keys.Universal.StartSearch). + Tap(func() { + t.ExpectSearch(). + Type("o"). + Confirm() + + t.Views().Search().Content(Contains("matches for 'o' (2 of 3)")) + }). + Lines( + Contains("four"), + Contains("three"), + Contains("two").IsSelected(), + Contains("one"), + ). + Press("n"). + Tap(func() { + t.Views().Search().Content(Contains("matches for 'o' (3 of 3)")) + }). + Lines( + Contains("four"), + Contains("three"), + Contains("two"), + Contains("one").IsSelected(), + ). + Press("n"). + Tap(func() { + t.Views().Search().Content(Contains("matches for 'o' (1 of 3)")) + }). + Lines( + Contains("four").IsSelected(), + Contains("three"), + Contains("two"), + Contains("one"), + ). + Press("n"). + Tap(func() { + t.Views().Search().Content(Contains("matches for 'o' (2 of 3)")) + }). + Lines( + Contains("four"), + Contains("three"), + Contains("two").IsSelected(), + Contains("one"), + ). + Press("N"). + Tap(func() { + t.Views().Search().Content(Contains("matches for 'o' (1 of 3)")) + }). + Lines( + Contains("four").IsSelected(), + Contains("three"), + Contains("two"), + Contains("one"), + ). + Press("N"). + Tap(func() { + t.Views().Search().Content(Contains("matches for 'o' (3 of 3)")) + }). + Lines( + Contains("four"), + Contains("three"), + Contains("two"), + Contains("one").IsSelected(), + ) + }, +}) diff --git a/pkg/integration/tests/commit/set_author.go b/pkg/integration/tests/commit/set_author.go new file mode 100644 index 000000000..047ac167c --- /dev/null +++ b/pkg/integration/tests/commit/set_author.go @@ -0,0 +1,51 @@ +package commit + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var SetAuthor = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Set author on a commit", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.SetConfig("user.email", "Bill@example.com") + shell.SetConfig("user.name", "Bill Smith") + + shell.EmptyCommit("one") + + shell.SetConfig("user.email", "John@example.com") + shell.SetConfig("user.name", "John Smith") + + shell.EmptyCommit("two") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Lines( + Contains("JS").Contains("two").IsSelected(), + Contains("BS").Contains("one"), + ). + Press(keys.Commits.ResetCommitAuthor). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Equals("Amend commit attribute")). + Select(Contains(" set author")). // adding space at start to distinguish from 'reset author' + Confirm() + + t.ExpectPopup().Prompt(). + Title(Contains("Set author")). + SuggestionLines( + Contains("John Smith"), + Contains("Bill Smith"), + ). + ConfirmSuggestion(Contains("John Smith")) + }). + Lines( + Contains("JS").Contains("two").IsSelected(), + Contains("BS").Contains("one"), + ) + }, +}) 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/reflog/checkout.go b/pkg/integration/tests/reflog/checkout.go new file mode 100644 index 000000000..9307ab609 --- /dev/null +++ b/pkg/integration/tests/reflog/checkout.go @@ -0,0 +1,55 @@ +package reflog + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var Checkout = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Checkout a reflog commit as a detached head", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + shell.EmptyCommit("two") + shell.EmptyCommit("three") + shell.HardReset("HEAD^^") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().ReflogCommits(). + Focus(). + Lines( + Contains("reset: moving to HEAD^^").IsSelected(), + Contains("commit: three"), + Contains("commit: two"), + Contains("commit (initial): one"), + ). + SelectNextItem(). + PressPrimaryAction(). + Tap(func() { + t.ExpectPopup().Confirmation(). + Title(Contains("checkout commit")). + Content(Contains("Are you sure you want to checkout this commit?")). + Confirm() + }). + TopLines( + Contains("checkout: moving from master to").IsSelected(), + Contains("reset: moving to HEAD^^"), + ) + + t.Views().Branches(). + Lines( + Contains("(HEAD detached at").IsSelected(), + Contains("master"), + ) + + t.Views().Commits(). + Focus(). + Lines( + Contains("three").IsSelected(), + Contains("two"), + Contains("one"), + ) + }, +}) diff --git a/pkg/integration/tests/reflog/cherry_pick.go b/pkg/integration/tests/reflog/cherry_pick.go new file mode 100644 index 000000000..cc7f503e2 --- /dev/null +++ b/pkg/integration/tests/reflog/cherry_pick.go @@ -0,0 +1,50 @@ +package reflog + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var CherryPick = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Cherry pick a reflog commit", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + shell.EmptyCommit("two") + shell.EmptyCommit("three") + shell.HardReset("HEAD^^") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().ReflogCommits(). + Focus(). + Lines( + Contains("reset: moving to HEAD^^").IsSelected(), + Contains("commit: three"), + Contains("commit: two"), + Contains("commit (initial): one"), + ). + SelectNextItem(). + Press(keys.Commits.CherryPickCopy) + + t.Views().Information().Content(Contains("1 commit copied")) + + t.Views().Commits(). + Focus(). + Lines( + Contains("one").IsSelected(), + ). + Press(keys.Commits.PasteCommits). + Tap(func() { + t.ExpectPopup().Alert(). + Title(Equals("Cherry-Pick")). + Content(Contains("Are you sure you want to cherry-pick the copied commits onto this branch?")). + Confirm() + }). + Lines( + Contains("three").IsSelected(), + Contains("one"), + ) + }, +}) diff --git a/pkg/integration/tests/reflog/patch.go b/pkg/integration/tests/reflog/patch.go new file mode 100644 index 000000000..568f36c43 --- /dev/null +++ b/pkg/integration/tests/reflog/patch.go @@ -0,0 +1,64 @@ +package reflog + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var Patch = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Build a patch from a reflog commit and apply it", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + shell.EmptyCommit("two") + shell.CreateFileAndAdd("file1", "content1") + shell.CreateFileAndAdd("file2", "content2") + shell.Commit("three") + shell.HardReset("HEAD^^") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().ReflogCommits(). + Focus(). + Lines( + Contains("reset: moving to HEAD^^").IsSelected(), + Contains("commit: three"), + Contains("commit: two"), + Contains("commit (initial): one"), + ). + SelectNextItem(). + PressEnter() + + t.Views().SubCommits(). + IsFocused(). + Lines( + Contains("three").IsSelected(), + Contains("two"), + Contains("one"), + ). + PressEnter() + + t.Views().CommitFiles(). + IsFocused(). + Lines( + Contains("file1").IsSelected(), + Contains("file2"), + ). + PressPrimaryAction() + + t.Views().Information().Content(Contains("building patch")) + + t.Views(). + CommitFiles(). + Press(keys.Universal.CreatePatchOptionsMenu) + + t.ExpectPopup().Menu(). + Title(Equals("Patch Options")). + Select(MatchesRegexp(`apply patch$`)).Confirm() + + t.Views().Files().Lines( + Contains("file1"), + ) + }, +}) diff --git a/pkg/integration/tests/reflog/reset.go b/pkg/integration/tests/reflog/reset.go new file mode 100644 index 000000000..80c11cbb7 --- /dev/null +++ b/pkg/integration/tests/reflog/reset.go @@ -0,0 +1,49 @@ +package reflog + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var Reset = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Hard reset to a reflog commit", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + shell.EmptyCommit("two") + shell.EmptyCommit("three") + shell.HardReset("HEAD^^") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().ReflogCommits(). + Focus(). + Lines( + Contains("reset: moving to HEAD^^").IsSelected(), + Contains("commit: three"), + Contains("commit: two"), + Contains("commit (initial): one"), + ). + SelectNextItem(). + Press(keys.Commits.ViewResetOptions). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Contains("reset to")). + Select(Contains("hard reset")). + Confirm() + }). + TopLines( + Contains("reset: moving to").IsSelected(), + Contains("reset: moving to HEAD^^"), + ) + + t.Views().Commits(). + Focus(). + Lines( + Contains("three").IsSelected(), + Contains("two"), + Contains("one"), + ) + }, +}) diff --git a/pkg/integration/tests/staging/search.go b/pkg/integration/tests/staging/search.go new file mode 100644 index 000000000..b7a42a276 --- /dev/null +++ b/pkg/integration/tests/staging/search.go @@ -0,0 +1,42 @@ +package staging + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var Search = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Use the search feature in the staging panel", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFile("file1", "one\ntwo\nthree\nfour\nfive") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Lines( + Contains("file1").IsSelected(), + ). + PressEnter() + + t.Views().Staging(). + IsFocused(). + Press(keys.Universal.StartSearch). + Tap(func() { + t.ExpectSearch(). + Type("four"). + Confirm() + + t.Views().Search().Content(Contains("matches for 'four' (1 of 1)")) + }). + SelectedLine(Contains("+four")). // stage the line + PressPrimaryAction(). + Content(DoesNotContain("+four")). + Tap(func() { + t.Views().StagingSecondary(). + Content(Contains("+four")) + }) + }, +}) 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 6a7e36373..c99870d43 100644 --- a/pkg/integration/tests/tests_gen.go +++ b/pkg/integration/tests/tests_gen.go @@ -17,6 +17,8 @@ import ( "github.com/jesseduffield/lazygit/pkg/integration/tests/interactive_rebase" "github.com/jesseduffield/lazygit/pkg/integration/tests/misc" "github.com/jesseduffield/lazygit/pkg/integration/tests/patch_building" + "github.com/jesseduffield/lazygit/pkg/integration/tests/reflog" + "github.com/jesseduffield/lazygit/pkg/integration/tests/staging" "github.com/jesseduffield/lazygit/pkg/integration/tests/stash" "github.com/jesseduffield/lazygit/pkg/integration/tests/submodule" "github.com/jesseduffield/lazygit/pkg/integration/tests/sync" @@ -37,6 +39,8 @@ var tests = []*components.IntegrationTest{ branch.RebaseAndDrop, branch.RebaseDoesNotAutosquash, branch.Reset, + branch.ResetUpstream, + branch.SetUpstream, branch.Suggestions, cherry_pick.CherryPick, cherry_pick.CherryPickConflicts, @@ -45,8 +49,11 @@ var tests = []*components.IntegrationTest{ commit.CreateTag, commit.DiscardOldFileChange, commit.NewBranch, + commit.ResetAuthor, commit.Revert, commit.RevertMerge, + commit.Search, + commit.SetAuthor, commit.StageRangeOfLines, commit.Staged, commit.StagedWithoutHooks, @@ -87,6 +94,11 @@ var tests = []*components.IntegrationTest{ misc.ConfirmOnQuit, misc.InitialOpen, patch_building.CopyPatchToClipboard, + reflog.Checkout, + reflog.CherryPick, + reflog.Patch, + reflog.Reset, + staging.Search, stash.Apply, stash.ApplyPatch, stash.CreateBranch, @@ -109,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 } diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/reflogCheckout/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 6c493ff74..000000000 --- a/test/integration/reflogCheckout/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -file2 diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/FETCH_HEAD b/test/integration/reflogCheckout/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/HEAD b/test/integration/reflogCheckout/expected/repo/.git_keep/HEAD deleted file mode 100644 index 63e0b0bf0..000000000 --- a/test/integration/reflogCheckout/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/ma diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/config b/test/integration/reflogCheckout/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/reflogCheckout/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/description b/test/integration/reflogCheckout/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/reflogCheckout/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/reflogCheckout/expected/repo/.git_keep/index b/test/integration/reflogCheckout/expected/repo/.git_keep/index deleted file mode 100644 index 6f3c8c471..000000000 Binary files a/test/integration/reflogCheckout/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/info/exclude b/test/integration/reflogCheckout/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/reflogCheckout/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/reflogCheckout/expected/repo/.git_keep/logs/HEAD b/test/integration/reflogCheckout/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 6fcc2f198..000000000 --- a/test/integration/reflogCheckout/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,10 +0,0 @@ -0000000000000000000000000000000000000000 2b16e862b7fc2a6ce1e711e5e174bc2f08c0e001 CI 1617683558 +1000 commit (initial): file0 -2b16e862b7fc2a6ce1e711e5e174bc2f08c0e001 9acb41da3b683497b3966135ccd64411b8ef698f CI 1617683558 +1000 commit: file1 -9acb41da3b683497b3966135ccd64411b8ef698f 40e3ff58efe2f50bc70ab084aba687ffd56dcd38 CI 1617683558 +1000 commit: file2 -40e3ff58efe2f50bc70ab084aba687ffd56dcd38 ced0c7ee1af3cd078a0bd940fa45e973dfd0f226 CI 1617683558 +1000 commit: file4 -ced0c7ee1af3cd078a0bd940fa45e973dfd0f226 ced0c7ee1af3cd078a0bd940fa45e973dfd0f226 CI 1617683558 +1000 checkout: moving from master to branch2 -ced0c7ee1af3cd078a0bd940fa45e973dfd0f226 fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 CI 1617683558 +1000 commit: file4 -fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 37661793a793e075730b85b9c3b300195738fc63 CI 1617683558 +1000 commit: file4 -37661793a793e075730b85b9c3b300195738fc63 10e005e1fa2db07721aa63cb048b87b7a2830b64 CI 1617683558 +1000 commit: file2 -10e005e1fa2db07721aa63cb048b87b7a2830b64 fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 CI 1617683563 +1000 checkout: moving from branch2 to fdc461cdae46cbcd0e8b -fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 CI 1617683567 +1000 checkout: moving from fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 to ma diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/logs/refs/heads/branch2 b/test/integration/reflogCheckout/expected/repo/.git_keep/logs/refs/heads/branch2 deleted file mode 100644 index 071cb8406..000000000 --- a/test/integration/reflogCheckout/expected/repo/.git_keep/logs/refs/heads/branch2 +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 ced0c7ee1af3cd078a0bd940fa45e973dfd0f226 CI 1617683558 +1000 branch: Created from HEAD -ced0c7ee1af3cd078a0bd940fa45e973dfd0f226 fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 CI 1617683558 +1000 commit: file4 -fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 37661793a793e075730b85b9c3b300195738fc63 CI 1617683558 +1000 commit: file4 -37661793a793e075730b85b9c3b300195738fc63 10e005e1fa2db07721aa63cb048b87b7a2830b64 CI 1617683558 +1000 commit: file2 diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/logs/refs/heads/ma b/test/integration/reflogCheckout/expected/repo/.git_keep/logs/refs/heads/ma deleted file mode 100644 index 4d6ce4df1..000000000 --- a/test/integration/reflogCheckout/expected/repo/.git_keep/logs/refs/heads/ma +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 fdc461cdae46cbcd0e8b6f33898b25a17ab36f32 CI 1617683567 +1000 branch: Created from fdc461c diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/reflogCheckout/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 331bd0c7a..000000000 --- a/test/integration/reflogCheckout/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 2b16e862b7fc2a6ce1e711e5e174bc2f08c0e001 CI 1617683558 +1000 commit (initial): file0 -2b16e862b7fc2a6ce1e711e5e174bc2f08c0e001 9acb41da3b683497b3966135ccd64411b8ef698f CI 1617683558 +1000 commit: file1 -9acb41da3b683497b3966135ccd64411b8ef698f 40e3ff58efe2f50bc70ab084aba687ffd56dcd38 CI 1617683558 +1000 commit: file2 -40e3ff58efe2f50bc70ab084aba687ffd56dcd38 ced0c7ee1af3cd078a0bd940fa45e973dfd0f226 CI 1617683558 +1000 commit: file4 diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 deleted file mode 100644 index 38acaeff2..000000000 Binary files a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 and /dev/null differ diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/10/e005e1fa2db07721aa63cb048b87b7a2830b64 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/10/e005e1fa2db07721aa63cb048b87b7a2830b64 deleted file mode 100644 index 1e1c0fb39..000000000 Binary files a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/10/e005e1fa2db07721aa63cb048b87b7a2830b64 and /dev/null differ diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67..000000000 Binary files a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 and /dev/null differ diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/2b/16e862b7fc2a6ce1e711e5e174bc2f08c0e001 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/2b/16e862b7fc2a6ce1e711e5e174bc2f08c0e001 deleted file mode 100644 index 7dc2d466c..000000000 Binary files a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/2b/16e862b7fc2a6ce1e711e5e174bc2f08c0e001 and /dev/null differ diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 deleted file mode 100644 index d4270c258..000000000 Binary files a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 and /dev/null differ diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/37/661793a793e075730b85b9c3b300195738fc63 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/37/661793a793e075730b85b9c3b300195738fc63 deleted file mode 100644 index e32ec0914..000000000 Binary files a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/37/661793a793e075730b85b9c3b300195738fc63 and /dev/null differ diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d..000000000 Binary files a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da and /dev/null differ diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a deleted file mode 100644 index 65140e8b7..000000000 Binary files a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a and /dev/null differ diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b deleted file mode 100644 index e0473aaf4..000000000 Binary files a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b and /dev/null differ diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/40/e3ff58efe2f50bc70ab084aba687ffd56dcd38 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/40/e3ff58efe2f50bc70ab084aba687ffd56dcd38 deleted file mode 100644 index 2f6201ab7..000000000 Binary files a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/40/e3ff58efe2f50bc70ab084aba687ffd56dcd38 and /dev/null differ diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 deleted file mode 100644 index ed5045497..000000000 Binary files a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 and /dev/null differ diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 deleted file mode 100644 index 2920ab335..000000000 Binary files a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 and /dev/null differ diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/9a/cb41da3b683497b3966135ccd64411b8ef698f b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/9a/cb41da3b683497b3966135ccd64411b8ef698f deleted file mode 100644 index b310aa841..000000000 Binary files a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/9a/cb41da3b683497b3966135ccd64411b8ef698f and /dev/null differ diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06d..000000000 Binary files a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c and /dev/null differ diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/ce/d0c7ee1af3cd078a0bd940fa45e973dfd0f226 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/ce/d0c7ee1af3cd078a0bd940fa45e973dfd0f226 deleted file mode 100644 index b7e0a5cab..000000000 --- a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/ce/d0c7ee1af3cd078a0bd940fa45e973dfd0f226 +++ /dev/null @@ -1,2 +0,0 @@ -xM -0@a9EL~&U1IfR"x|{o궮sn~X$b}KB%z!n#HPEfp0vqqzʗ}[ևuD99Ont^$: \ No newline at end of file diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 +++ /dev/null @@ -1,2 +0,0 @@ -x+)JMU03c040031QHI5`ֶww.hT[H - yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 deleted file mode 100644 index 01ce23cee..000000000 Binary files a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 and /dev/null differ diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a deleted file mode 100644 index 08edf28f3..000000000 Binary files a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a and /dev/null differ diff --git a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/fd/c461cdae46cbcd0e8b6f33898b25a17ab36f32 b/test/integration/reflogCheckout/expected/repo/.git_keep/objects/fd/c461cdae46cbcd0e8b6f33898b25a17ab36f32 deleted file mode 100644 index 72227f67d..000000000 --- a/test/integration/reflogCheckout/expected/repo/.git_keep/objects/fd/c461cdae46cbcd0e8b6f33898b25a17ab36f32 +++ /dev/null @@ -1,2 +0,0 @@ -xK -0FaYE file0 -git add . -git commit -am file0 - -echo test1 > file1 -git add . -git commit -am file1 - -echo test2 > file2 -git add . -git commit -am file2 - -echo "line one" > file4 -git add . -git commit -am file4 - -git checkout -b branch2 - -echo "line two" >> file4 -git add . -git commit -am file4 - -echo "line three" >> file4 -git add . -git commit -am file4 - -echo "line two" >> file2 -git add . -git commit -am file2 diff --git a/test/integration/reflogCheckout/test.json b/test/integration/reflogCheckout/test.json deleted file mode 100644 index 40f23e49c..000000000 --- a/test/integration/reflogCheckout/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "checking out a commit in the reflog context", "speed": 10 } diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/reflogCherryPick/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 6c493ff74..000000000 --- a/test/integration/reflogCherryPick/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -file2 diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/FETCH_HEAD b/test/integration/reflogCherryPick/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/HEAD b/test/integration/reflogCherryPick/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/reflogCherryPick/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/ORIG_HEAD b/test/integration/reflogCherryPick/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 9a97fa86f..000000000 --- a/test/integration/reflogCherryPick/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -afeb127e4579981e4b852e8aabb44b07f2ea4e09 diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/config b/test/integration/reflogCherryPick/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/reflogCherryPick/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/description b/test/integration/reflogCherryPick/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/reflogCherryPick/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/reflogCherryPick/expected/repo/.git_keep/index b/test/integration/reflogCherryPick/expected/repo/.git_keep/index deleted file mode 100644 index 913dfd580..000000000 Binary files a/test/integration/reflogCherryPick/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/info/exclude b/test/integration/reflogCherryPick/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/reflogCherryPick/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/reflogCherryPick/expected/repo/.git_keep/logs/HEAD b/test/integration/reflogCherryPick/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index a2378d782..000000000 --- a/test/integration/reflogCherryPick/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,12 +0,0 @@ -0000000000000000000000000000000000000000 5a5a519752ffd367bbd85dfbc19e5b18d44d6223 CI 1617683609 +1000 commit (initial): file0 -5a5a519752ffd367bbd85dfbc19e5b18d44d6223 713ec49844ebad06a5c98fd3c5ce1445f664c3c6 CI 1617683609 +1000 commit: file1 -713ec49844ebad06a5c98fd3c5ce1445f664c3c6 e23253d1f81331e1c94a5a5f68e2d4cc1cbee2fd CI 1617683609 +1000 commit: file2 -e23253d1f81331e1c94a5a5f68e2d4cc1cbee2fd afeb127e4579981e4b852e8aabb44b07f2ea4e09 CI 1617683609 +1000 commit: file4 -afeb127e4579981e4b852e8aabb44b07f2ea4e09 afeb127e4579981e4b852e8aabb44b07f2ea4e09 CI 1617683609 +1000 checkout: moving from master to branch2 -afeb127e4579981e4b852e8aabb44b07f2ea4e09 ac7b38400c8aed050f379f9643b953b9d428fda1 CI 1617683609 +1000 commit: file4 -ac7b38400c8aed050f379f9643b953b9d428fda1 a955e641b00e7e896842122a3537c70476d7b4e0 CI 1617683609 +1000 commit: file4 -a955e641b00e7e896842122a3537c70476d7b4e0 bc8891320172f4cfa3efd7bb8767a46daa200d79 CI 1617683609 +1000 commit: file2 -bc8891320172f4cfa3efd7bb8767a46daa200d79 afeb127e4579981e4b852e8aabb44b07f2ea4e09 CI 1617683610 +1000 checkout: moving from branch2 to master -afeb127e4579981e4b852e8aabb44b07f2ea4e09 afeb127e4579981e4b852e8aabb44b07f2ea4e09 CI 1617683619 +1000 rebase -i (start): checkout HEAD -afeb127e4579981e4b852e8aabb44b07f2ea4e09 35bedc872b1ca9e026e51c4017416acba4b3d64b CI 1617683619 +1000 rebase -i (pick): file2 -35bedc872b1ca9e026e51c4017416acba4b3d64b 35bedc872b1ca9e026e51c4017416acba4b3d64b CI 1617683619 +1000 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/logs/refs/heads/branch2 b/test/integration/reflogCherryPick/expected/repo/.git_keep/logs/refs/heads/branch2 deleted file mode 100644 index fc6af3173..000000000 --- a/test/integration/reflogCherryPick/expected/repo/.git_keep/logs/refs/heads/branch2 +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 afeb127e4579981e4b852e8aabb44b07f2ea4e09 CI 1617683609 +1000 branch: Created from HEAD -afeb127e4579981e4b852e8aabb44b07f2ea4e09 ac7b38400c8aed050f379f9643b953b9d428fda1 CI 1617683609 +1000 commit: file4 -ac7b38400c8aed050f379f9643b953b9d428fda1 a955e641b00e7e896842122a3537c70476d7b4e0 CI 1617683609 +1000 commit: file4 -a955e641b00e7e896842122a3537c70476d7b4e0 bc8891320172f4cfa3efd7bb8767a46daa200d79 CI 1617683609 +1000 commit: file2 diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/reflogCherryPick/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 7d698f8ae..000000000 --- a/test/integration/reflogCherryPick/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 5a5a519752ffd367bbd85dfbc19e5b18d44d6223 CI 1617683609 +1000 commit (initial): file0 -5a5a519752ffd367bbd85dfbc19e5b18d44d6223 713ec49844ebad06a5c98fd3c5ce1445f664c3c6 CI 1617683609 +1000 commit: file1 -713ec49844ebad06a5c98fd3c5ce1445f664c3c6 e23253d1f81331e1c94a5a5f68e2d4cc1cbee2fd CI 1617683609 +1000 commit: file2 -e23253d1f81331e1c94a5a5f68e2d4cc1cbee2fd afeb127e4579981e4b852e8aabb44b07f2ea4e09 CI 1617683609 +1000 commit: file4 -afeb127e4579981e4b852e8aabb44b07f2ea4e09 35bedc872b1ca9e026e51c4017416acba4b3d64b CI 1617683619 +1000 rebase -i (finish): refs/heads/master onto afeb127e4579981e4b852e8aabb44b07f2ea4e09 diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 deleted file mode 100644 index 38acaeff2..000000000 Binary files a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 and /dev/null differ diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67..000000000 Binary files a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 and /dev/null differ diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 deleted file mode 100644 index d4270c258..000000000 Binary files a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 and /dev/null differ diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/35/bedc872b1ca9e026e51c4017416acba4b3d64b b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/35/bedc872b1ca9e026e51c4017416acba4b3d64b deleted file mode 100644 index afcab4de2..000000000 --- a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/35/bedc872b1ca9e026e51c4017416acba4b3d64b +++ /dev/null @@ -1,2 +0,0 @@ -x}M -0@a9Ed&cN`m)<ݸu2w ZKj@2c$sNf]_JBbΠTr@":6uhx׏,S/u]n"}tl3G=OErK9 \ No newline at end of file diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d..000000000 Binary files a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da and /dev/null differ diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a deleted file mode 100644 index 65140e8b7..000000000 Binary files a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a and /dev/null differ diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b deleted file mode 100644 index e0473aaf4..000000000 Binary files a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b and /dev/null differ diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/43/12f3a59c644c52ad89254be43d7a7987e56bed b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/43/12f3a59c644c52ad89254be43d7a7987e56bed deleted file mode 100644 index a8e70c668..000000000 Binary files a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/43/12f3a59c644c52ad89254be43d7a7987e56bed and /dev/null differ diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 deleted file mode 100644 index ed5045497..000000000 Binary files a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 and /dev/null differ diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/5a/5a519752ffd367bbd85dfbc19e5b18d44d6223 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/5a/5a519752ffd367bbd85dfbc19e5b18d44d6223 deleted file mode 100644 index ed4c460f1..000000000 --- a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/5a/5a519752ffd367bbd85dfbc19e5b18d44d6223 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9IIDz`!Dn?j];f@69=Hdc*\Ч\+wi4mi $d۟ܕu3t?8+ \ No newline at end of file diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/71/3ec49844ebad06a5c98fd3c5ce1445f664c3c6 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/71/3ec49844ebad06a5c98fd3c5ce1445f664c3c6 deleted file mode 100644 index 254d31eaa..000000000 --- a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/71/3ec49844ebad06a5c98fd3c5ce1445f664c3c6 +++ /dev/null @@ -1,2 +0,0 @@ -xM -0F] Ϥ"BW=$`Dv֮쥟"9SΆ83ⰦB-N3ɣu)buS*S($!T/hS/c[CBɡ!}c I9 \ No newline at end of file diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 deleted file mode 100644 index 2920ab335..000000000 Binary files a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 and /dev/null differ diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06d..000000000 Binary files a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c and /dev/null differ diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/a9/55e641b00e7e896842122a3537c70476d7b4e0 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/a9/55e641b00e7e896842122a3537c70476d7b4e0 deleted file mode 100644 index f1acbc48f..000000000 Binary files a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/a9/55e641b00e7e896842122a3537c70476d7b4e0 and /dev/null differ diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/ac/7b38400c8aed050f379f9643b953b9d428fda1 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/ac/7b38400c8aed050f379f9643b953b9d428fda1 deleted file mode 100644 index 28711d3e7..000000000 --- a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/ac/7b38400c8aed050f379f9643b953b9d428fda1 +++ /dev/null @@ -1,2 +0,0 @@ -xK -0FaYEq./[Jo NZ[] br&"AAb }r^|5(RIYHL`OmF}'Ѧ}4E_1FyYA:! \ No newline at end of file diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/af/eb127e4579981e4b852e8aabb44b07f2ea4e09 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/af/eb127e4579981e4b852e8aabb44b07f2ea4e09 deleted file mode 100644 index 3861432eb..000000000 Binary files a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/af/eb127e4579981e4b852e8aabb44b07f2ea4e09 and /dev/null differ diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/bc/8891320172f4cfa3efd7bb8767a46daa200d79 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/bc/8891320172f4cfa3efd7bb8767a46daa200d79 deleted file mode 100644 index 97cea4509..000000000 Binary files a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/bc/8891320172f4cfa3efd7bb8767a46daa200d79 and /dev/null differ diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 +++ /dev/null @@ -1,2 +0,0 @@ -x+)JMU03c040031QHI5`ֶww.hT[H - yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/e2/3253d1f81331e1c94a5a5f68e2d4cc1cbee2fd b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/e2/3253d1f81331e1c94a5a5f68e2d4cc1cbee2fd deleted file mode 100644 index 557ada37e..000000000 Binary files a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/e2/3253d1f81331e1c94a5a5f68e2d4cc1cbee2fd and /dev/null differ diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 deleted file mode 100644 index 01ce23cee..000000000 Binary files a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 and /dev/null differ diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a deleted file mode 100644 index 08edf28f3..000000000 Binary files a/test/integration/reflogCherryPick/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a and /dev/null differ diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/refs/heads/branch2 b/test/integration/reflogCherryPick/expected/repo/.git_keep/refs/heads/branch2 deleted file mode 100644 index bd45e4cdd..000000000 --- a/test/integration/reflogCherryPick/expected/repo/.git_keep/refs/heads/branch2 +++ /dev/null @@ -1 +0,0 @@ -bc8891320172f4cfa3efd7bb8767a46daa200d79 diff --git a/test/integration/reflogCherryPick/expected/repo/.git_keep/refs/heads/master b/test/integration/reflogCherryPick/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 255e95bd9..000000000 --- a/test/integration/reflogCherryPick/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -35bedc872b1ca9e026e51c4017416acba4b3d64b diff --git a/test/integration/reflogCherryPick/expected/repo/file0 b/test/integration/reflogCherryPick/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/reflogCherryPick/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/reflogCherryPick/expected/repo/file1 b/test/integration/reflogCherryPick/expected/repo/file1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/reflogCherryPick/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/reflogCherryPick/expected/repo/file2 b/test/integration/reflogCherryPick/expected/repo/file2 deleted file mode 100644 index 3baaa732b..000000000 --- a/test/integration/reflogCherryPick/expected/repo/file2 +++ /dev/null @@ -1,2 +0,0 @@ -test2 -line two diff --git a/test/integration/reflogCherryPick/expected/repo/file4 b/test/integration/reflogCherryPick/expected/repo/file4 deleted file mode 100644 index 2d00bd505..000000000 --- a/test/integration/reflogCherryPick/expected/repo/file4 +++ /dev/null @@ -1 +0,0 @@ -line one diff --git a/test/integration/reflogCherryPick/recording.json b/test/integration/reflogCherryPick/recording.json deleted file mode 100644 index aa6a25783..000000000 --- a/test/integration/reflogCherryPick/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":574,"Mod":0,"Key":259,"Ch":0},{"Timestamp":829,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1029,"Mod":0,"Key":256,"Ch":32},{"Timestamp":2773,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4325,"Mod":0,"Key":259,"Ch":0},{"Timestamp":4933,"Mod":0,"Key":256,"Ch":93},{"Timestamp":6029,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7524,"Mod":0,"Key":256,"Ch":99},{"Timestamp":8861,"Mod":0,"Key":256,"Ch":91},{"Timestamp":9613,"Mod":0,"Key":256,"Ch":118},{"Timestamp":9974,"Mod":0,"Key":13,"Ch":13},{"Timestamp":10837,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/reflogCherryPick/setup.sh b/test/integration/reflogCherryPick/setup.sh deleted file mode 100644 index 4cd444a1f..000000000 --- a/test/integration/reflogCherryPick/setup.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -echo test0 > file0 -git add . -git commit -am file0 - -echo test1 > file1 -git add . -git commit -am file1 - -echo test2 > file2 -git add . -git commit -am file2 - -echo "line one" > file4 -git add . -git commit -am file4 - -git checkout -b branch2 - -echo "line two" >> file4 -git add . -git commit -am file4 - -echo "line three" >> file4 -git add . -git commit -am file4 - -echo "line two" >> file2 -git add . -git commit -am file2 diff --git a/test/integration/reflogCherryPick/test.json b/test/integration/reflogCherryPick/test.json deleted file mode 100644 index 01c3dcbd4..000000000 --- a/test/integration/reflogCherryPick/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "cherry-picking a commit from the reflog context", "speed": 10 } diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/reflogCommitFiles/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index d72af3146..000000000 --- a/test/integration/reflogCommitFiles/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -asd diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/FETCH_HEAD b/test/integration/reflogCommitFiles/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/HEAD b/test/integration/reflogCommitFiles/expected/repo/.git_keep/HEAD deleted file mode 100644 index 1d57c9ea7..000000000 --- a/test/integration/reflogCommitFiles/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/branch2 diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/config b/test/integration/reflogCommitFiles/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/reflogCommitFiles/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/description b/test/integration/reflogCommitFiles/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/reflogCommitFiles/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/reflogCommitFiles/expected/repo/.git_keep/index b/test/integration/reflogCommitFiles/expected/repo/.git_keep/index deleted file mode 100644 index 1f9535e1a..000000000 Binary files a/test/integration/reflogCommitFiles/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/info/exclude b/test/integration/reflogCommitFiles/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/reflogCommitFiles/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/reflogCommitFiles/expected/repo/.git_keep/logs/HEAD b/test/integration/reflogCommitFiles/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index fc2f3142e..000000000 --- a/test/integration/reflogCommitFiles/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,9 +0,0 @@ -0000000000000000000000000000000000000000 a6cc56fedc3f0fc234dcacef1f1de2706c32c44b CI 1617683727 +1000 commit (initial): file0 -a6cc56fedc3f0fc234dcacef1f1de2706c32c44b 7d61d1707885895d92f021111196df4466347327 CI 1617683727 +1000 commit: file1 -7d61d1707885895d92f021111196df4466347327 c54d82926c7b673499d675aec8732cfe08aed761 CI 1617683727 +1000 commit: file2 -c54d82926c7b673499d675aec8732cfe08aed761 445557afd2775df735bc53b891678e6bd9072638 CI 1617683727 +1000 commit: file4 -445557afd2775df735bc53b891678e6bd9072638 445557afd2775df735bc53b891678e6bd9072638 CI 1617683727 +1000 checkout: moving from master to branch2 -445557afd2775df735bc53b891678e6bd9072638 756e436bdd05b965c967edc1929432917e3864cd CI 1617683727 +1000 commit: file4 -756e436bdd05b965c967edc1929432917e3864cd 07e795700fa240713f5577867a45eb6f2071d856 CI 1617683727 +1000 commit: file4 -07e795700fa240713f5577867a45eb6f2071d856 5326459d9a0c196b18cc31dc95f05c9a4e4462de CI 1617683728 +1000 commit: file2 -5326459d9a0c196b18cc31dc95f05c9a4e4462de b0bf1c26d59a724c767948a6de15664bfc0c292f CI 1617683735 +1000 commit: asd diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/logs/refs/heads/branch2 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/logs/refs/heads/branch2 deleted file mode 100644 index 222df85dc..000000000 --- a/test/integration/reflogCommitFiles/expected/repo/.git_keep/logs/refs/heads/branch2 +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 445557afd2775df735bc53b891678e6bd9072638 CI 1617683727 +1000 branch: Created from HEAD -445557afd2775df735bc53b891678e6bd9072638 756e436bdd05b965c967edc1929432917e3864cd CI 1617683727 +1000 commit: file4 -756e436bdd05b965c967edc1929432917e3864cd 07e795700fa240713f5577867a45eb6f2071d856 CI 1617683727 +1000 commit: file4 -07e795700fa240713f5577867a45eb6f2071d856 5326459d9a0c196b18cc31dc95f05c9a4e4462de CI 1617683728 +1000 commit: file2 -5326459d9a0c196b18cc31dc95f05c9a4e4462de b0bf1c26d59a724c767948a6de15664bfc0c292f CI 1617683735 +1000 commit: asd diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/reflogCommitFiles/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 2d7aeb3dd..000000000 --- a/test/integration/reflogCommitFiles/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 a6cc56fedc3f0fc234dcacef1f1de2706c32c44b CI 1617683727 +1000 commit (initial): file0 -a6cc56fedc3f0fc234dcacef1f1de2706c32c44b 7d61d1707885895d92f021111196df4466347327 CI 1617683727 +1000 commit: file1 -7d61d1707885895d92f021111196df4466347327 c54d82926c7b673499d675aec8732cfe08aed761 CI 1617683727 +1000 commit: file2 -c54d82926c7b673499d675aec8732cfe08aed761 445557afd2775df735bc53b891678e6bd9072638 CI 1617683727 +1000 commit: file4 diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/07/e795700fa240713f5577867a45eb6f2071d856 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/07/e795700fa240713f5577867a45eb6f2071d856 deleted file mode 100644 index d5890a188..000000000 Binary files a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/07/e795700fa240713f5577867a45eb6f2071d856 and /dev/null differ diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 deleted file mode 100644 index 38acaeff2..000000000 Binary files a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 and /dev/null differ diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67..000000000 Binary files a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 and /dev/null differ diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 deleted file mode 100644 index d4270c258..000000000 Binary files a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 and /dev/null differ diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d..000000000 Binary files a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da and /dev/null differ diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a deleted file mode 100644 index 65140e8b7..000000000 Binary files a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a and /dev/null differ diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b deleted file mode 100644 index e0473aaf4..000000000 Binary files a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b and /dev/null differ diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/44/5557afd2775df735bc53b891678e6bd9072638 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/44/5557afd2775df735bc53b891678e6bd9072638 deleted file mode 100644 index 942c4cb98..000000000 Binary files a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/44/5557afd2775df735bc53b891678e6bd9072638 and /dev/null differ diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/53/26459d9a0c196b18cc31dc95f05c9a4e4462de b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/53/26459d9a0c196b18cc31dc95f05c9a4e4462de deleted file mode 100644 index 44d19d016..000000000 Binary files a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/53/26459d9a0c196b18cc31dc95f05c9a4e4462de and /dev/null differ diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 deleted file mode 100644 index ed5045497..000000000 Binary files a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 and /dev/null differ diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/75/6e436bdd05b965c967edc1929432917e3864cd b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/75/6e436bdd05b965c967edc1929432917e3864cd deleted file mode 100644 index 11a1c2730..000000000 --- a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/75/6e436bdd05b965c967edc1929432917e3864cd +++ /dev/null @@ -1,3 +0,0 @@ -xK -0@]$L -"BW=$bDn+[kK7K?T!)lKX9QDB[eQJ!fCér"'} ȧ ԯ}[\tYe:k99O˪h~U9 \ No newline at end of file diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/7d/61d1707885895d92f021111196df4466347327 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/7d/61d1707885895d92f021111196df4466347327 deleted file mode 100644 index ce7286748..000000000 Binary files a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/7d/61d1707885895d92f021111196df4466347327 and /dev/null differ diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/86/3cae3fe21db864bc92b74ae4820e628e5eaf8b b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/86/3cae3fe21db864bc92b74ae4820e628e5eaf8b deleted file mode 100644 index 61445855a..000000000 Binary files a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/86/3cae3fe21db864bc92b74ae4820e628e5eaf8b and /dev/null differ diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 deleted file mode 100644 index 2920ab335..000000000 Binary files a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 and /dev/null differ diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06d..000000000 Binary files a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c and /dev/null differ diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/a6/cc56fedc3f0fc234dcacef1f1de2706c32c44b b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/a6/cc56fedc3f0fc234dcacef1f1de2706c32c44b deleted file mode 100644 index d86c14ae8..000000000 Binary files a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/a6/cc56fedc3f0fc234dcacef1f1de2706c32c44b and /dev/null differ diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/b0/bf1c26d59a724c767948a6de15664bfc0c292f b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/b0/bf1c26d59a724c767948a6de15664bfc0c292f deleted file mode 100644 index 18a6aebc7..000000000 --- a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/b0/bf1c26d59a724c767948a6de15664bfc0c292f +++ /dev/null @@ -1,2 +0,0 @@ -xM -0@a9Ed3@c2`l<=Ƿx;]a z0ɾ 5w4)/TƻMcLfv H*9-.I1jnَ|/Y€sT?w5?/95 \ No newline at end of file diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/c5/4d82926c7b673499d675aec8732cfe08aed761 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/c5/4d82926c7b673499d675aec8732cfe08aed761 deleted file mode 100644 index b1d3b6f0a..000000000 --- a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/c5/4d82926c7b673499d675aec8732cfe08aed761 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0E)/D3Rp1bfBSERkoп|<?o.BK;TmTDN2 2PB~Θ͞}5K@1{Xo1H|Gɤw{n';C?V™gOH -9sT?uSU|N8h \ No newline at end of file diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 +++ /dev/null @@ -1,2 +0,0 @@ -x+)JMU03c040031QHI5`ֶww.hT[H - yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 deleted file mode 100644 index 01ce23cee..000000000 Binary files a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 and /dev/null differ diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a deleted file mode 100644 index 08edf28f3..000000000 Binary files a/test/integration/reflogCommitFiles/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a and /dev/null differ diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/refs/heads/branch2 b/test/integration/reflogCommitFiles/expected/repo/.git_keep/refs/heads/branch2 deleted file mode 100644 index c47bc95c8..000000000 --- a/test/integration/reflogCommitFiles/expected/repo/.git_keep/refs/heads/branch2 +++ /dev/null @@ -1 +0,0 @@ -b0bf1c26d59a724c767948a6de15664bfc0c292f diff --git a/test/integration/reflogCommitFiles/expected/repo/.git_keep/refs/heads/master b/test/integration/reflogCommitFiles/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 7cfd9a220..000000000 --- a/test/integration/reflogCommitFiles/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -445557afd2775df735bc53b891678e6bd9072638 diff --git a/test/integration/reflogCommitFiles/expected/repo/file0 b/test/integration/reflogCommitFiles/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/reflogCommitFiles/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/reflogCommitFiles/expected/repo/file1 b/test/integration/reflogCommitFiles/expected/repo/file1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/reflogCommitFiles/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/reflogCommitFiles/expected/repo/file2 b/test/integration/reflogCommitFiles/expected/repo/file2 deleted file mode 100644 index 3baaa732b..000000000 --- a/test/integration/reflogCommitFiles/expected/repo/file2 +++ /dev/null @@ -1,2 +0,0 @@ -test2 -line two diff --git a/test/integration/reflogCommitFiles/expected/repo/file4 b/test/integration/reflogCommitFiles/expected/repo/file4 deleted file mode 100644 index e5c5c5583..000000000 --- a/test/integration/reflogCommitFiles/expected/repo/file4 +++ /dev/null @@ -1,2 +0,0 @@ -line one -line two diff --git a/test/integration/reflogCommitFiles/recording.json b/test/integration/reflogCommitFiles/recording.json deleted file mode 100644 index 8339b7ea7..000000000 --- a/test/integration/reflogCommitFiles/recording.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "KeyEvents": [ - { - "Timestamp": 608, - "Mod": 0, - "Key": 259, - "Ch": 0 - }, - { - "Timestamp": 768, - "Mod": 0, - "Key": 259, - "Ch": 0 - }, - { - "Timestamp": 1376, - "Mod": 0, - "Key": 256, - "Ch": 93 - }, - { - "Timestamp": 1817, - "Mod": 0, - "Key": 258, - "Ch": 0 - }, - { - "Timestamp": 2560, - "Mod": 0, - "Key": 13, - "Ch": 13 - }, - { - "Timestamp": 2860, - "Mod": 0, - "Key": 13, - "Ch": 13 - }, - { - "Timestamp": 3271, - "Mod": 0, - "Key": 256, - "Ch": 32 - }, - { - "Timestamp": 3936, - "Mod": 2, - "Key": 16, - "Ch": 16 - }, - { - "Timestamp": 4680, - "Mod": 0, - "Key": 258, - "Ch": 0 - }, - { - "Timestamp": 4945, - "Mod": 0, - "Key": 258, - "Ch": 0 - }, - { - "Timestamp": 5216, - "Mod": 0, - "Key": 13, - "Ch": 13 - }, - { - "Timestamp": 5712, - "Mod": 0, - "Key": 260, - "Ch": 0 - }, - { - "Timestamp": 5952, - "Mod": 0, - "Key": 260, - "Ch": 0 - }, - { - "Timestamp": 6191, - "Mod": 0, - "Key": 256, - "Ch": 99 - }, - { - "Timestamp": 6456, - "Mod": 0, - "Key": 256, - "Ch": 97 - }, - { - "Timestamp": 6536, - "Mod": 0, - "Key": 256, - "Ch": 115 - }, - { - "Timestamp": 6647, - "Mod": 0, - "Key": 256, - "Ch": 100 - }, - { - "Timestamp": 6968, - "Mod": 0, - "Key": 13, - "Ch": 13 - }, - { - "Timestamp": 7376, - "Mod": 0, - "Key": 256, - "Ch": 113 - } - ], - "ResizeEvents": [ - { - "Timestamp": 0, - "Width": 272, - "Height": 74 - } - ] -} diff --git a/test/integration/reflogCommitFiles/setup.sh b/test/integration/reflogCommitFiles/setup.sh deleted file mode 100644 index 4cd444a1f..000000000 --- a/test/integration/reflogCommitFiles/setup.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -echo test0 > file0 -git add . -git commit -am file0 - -echo test1 > file1 -git add . -git commit -am file1 - -echo test2 > file2 -git add . -git commit -am file2 - -echo "line one" > file4 -git add . -git commit -am file4 - -git checkout -b branch2 - -echo "line two" >> file4 -git add . -git commit -am file4 - -echo "line three" >> file4 -git add . -git commit -am file4 - -echo "line two" >> file2 -git add . -git commit -am file2 diff --git a/test/integration/reflogCommitFiles/test.json b/test/integration/reflogCommitFiles/test.json deleted file mode 100644 index df7ad6e19..000000000 --- a/test/integration/reflogCommitFiles/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "Accessing commit files of a reflog entry", "speed": 10 } diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/reflogHardReset/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 6c493ff74..000000000 --- a/test/integration/reflogHardReset/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -file2 diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/FETCH_HEAD b/test/integration/reflogHardReset/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/HEAD b/test/integration/reflogHardReset/expected/repo/.git_keep/HEAD deleted file mode 100644 index 1d57c9ea7..000000000 --- a/test/integration/reflogHardReset/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/branch2 diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/ORIG_HEAD b/test/integration/reflogHardReset/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 000eb0200..000000000 --- a/test/integration/reflogHardReset/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -1fd818af9eb65653e98def81168002cabc353b6a diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/config b/test/integration/reflogHardReset/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/reflogHardReset/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/description b/test/integration/reflogHardReset/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/reflogHardReset/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/reflogHardReset/expected/repo/.git_keep/index b/test/integration/reflogHardReset/expected/repo/.git_keep/index deleted file mode 100644 index fcbfa4ccf..000000000 Binary files a/test/integration/reflogHardReset/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/info/exclude b/test/integration/reflogHardReset/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/reflogHardReset/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/reflogHardReset/expected/repo/.git_keep/logs/HEAD b/test/integration/reflogHardReset/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 4b553fd32..000000000 --- a/test/integration/reflogHardReset/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,9 +0,0 @@ -0000000000000000000000000000000000000000 496408d5ed7b1edff760bf2ce56a43b9fab737e0 CI 1617683684 +1000 commit (initial): file0 -496408d5ed7b1edff760bf2ce56a43b9fab737e0 940576e482f2193afad72ea2205c05fd01507e1a CI 1617683684 +1000 commit: file1 -940576e482f2193afad72ea2205c05fd01507e1a 1883828474eb5bac8cb27c8a7a3614f9ea3137a0 CI 1617683684 +1000 commit: file2 -1883828474eb5bac8cb27c8a7a3614f9ea3137a0 16fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 CI 1617683684 +1000 commit: file4 -16fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 16fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 CI 1617683684 +1000 checkout: moving from master to branch2 -16fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 3e0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 CI 1617683684 +1000 commit: file4 -3e0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 7c03a659737f2cc728a2a572cedee98019bbd04b CI 1617683684 +1000 commit: file4 -7c03a659737f2cc728a2a572cedee98019bbd04b 1fd818af9eb65653e98def81168002cabc353b6a CI 1617683684 +1000 commit: file2 -1fd818af9eb65653e98def81168002cabc353b6a 3e0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 CI 1617683689 +1000 reset: moving to 3e0b28f0bcdd445c5f6d diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/logs/refs/heads/branch2 b/test/integration/reflogHardReset/expected/repo/.git_keep/logs/refs/heads/branch2 deleted file mode 100644 index 558ce9a6b..000000000 --- a/test/integration/reflogHardReset/expected/repo/.git_keep/logs/refs/heads/branch2 +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 16fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 CI 1617683684 +1000 branch: Created from HEAD -16fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 3e0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 CI 1617683684 +1000 commit: file4 -3e0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 7c03a659737f2cc728a2a572cedee98019bbd04b CI 1617683684 +1000 commit: file4 -7c03a659737f2cc728a2a572cedee98019bbd04b 1fd818af9eb65653e98def81168002cabc353b6a CI 1617683684 +1000 commit: file2 -1fd818af9eb65653e98def81168002cabc353b6a 3e0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 CI 1617683689 +1000 reset: moving to 3e0b28f0bcdd445c5f6d diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/reflogHardReset/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 11f14b24e..000000000 --- a/test/integration/reflogHardReset/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 496408d5ed7b1edff760bf2ce56a43b9fab737e0 CI 1617683684 +1000 commit (initial): file0 -496408d5ed7b1edff760bf2ce56a43b9fab737e0 940576e482f2193afad72ea2205c05fd01507e1a CI 1617683684 +1000 commit: file1 -940576e482f2193afad72ea2205c05fd01507e1a 1883828474eb5bac8cb27c8a7a3614f9ea3137a0 CI 1617683684 +1000 commit: file2 -1883828474eb5bac8cb27c8a7a3614f9ea3137a0 16fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 CI 1617683684 +1000 commit: file4 diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 deleted file mode 100644 index 38acaeff2..000000000 Binary files a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 and /dev/null differ diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/16/fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/16/fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 deleted file mode 100644 index a6ae1480f..000000000 --- a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/16/fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 +++ /dev/null @@ -1,2 +0,0 @@ -xK -0@] LU1'Xhl)<9{xomfw駈pF ܓ},@ DաQ!G7 %b‑|f!o=Qyyȗڱɍv6YH}5IP?oK9x \ No newline at end of file diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/18/83828474eb5bac8cb27c8a7a3614f9ea3137a0 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/18/83828474eb5bac8cb27c8a7a3614f9ea3137a0 deleted file mode 100644 index 471870fd2..000000000 --- a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/18/83828474eb5bac8cb27c8a7a3614f9ea3137a0 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0E] 23i ]dƖ#ium#]کj2K83LR=`Vd&$JS|gS!N@*D=E1ilԯc[Fjnʺ)H9 \ No newline at end of file diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67..000000000 Binary files a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 and /dev/null differ diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/1f/d818af9eb65653e98def81168002cabc353b6a b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/1f/d818af9eb65653e98def81168002cabc353b6a deleted file mode 100644 index c4caad22e..000000000 Binary files a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/1f/d818af9eb65653e98def81168002cabc353b6a and /dev/null differ diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 deleted file mode 100644 index d4270c258..000000000 Binary files a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 and /dev/null differ diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d..000000000 Binary files a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da and /dev/null differ diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a deleted file mode 100644 index 65140e8b7..000000000 Binary files a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a and /dev/null differ diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b deleted file mode 100644 index e0473aaf4..000000000 Binary files a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b and /dev/null differ diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/3e/0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/3e/0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 deleted file mode 100644 index a98e469b9..000000000 Binary files a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/3e/0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 and /dev/null differ diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/49/6408d5ed7b1edff760bf2ce56a43b9fab737e0 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/49/6408d5ed7b1edff760bf2ce56a43b9fab737e0 deleted file mode 100644 index 7d29a0959..000000000 Binary files a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/49/6408d5ed7b1edff760bf2ce56a43b9fab737e0 and /dev/null differ diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 deleted file mode 100644 index ed5045497..000000000 Binary files a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 and /dev/null differ diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/7c/03a659737f2cc728a2a572cedee98019bbd04b b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/7c/03a659737f2cc728a2a572cedee98019bbd04b deleted file mode 100644 index 75304b52b..000000000 Binary files a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/7c/03a659737f2cc728a2a572cedee98019bbd04b and /dev/null differ diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 deleted file mode 100644 index 2920ab335..000000000 Binary files a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 and /dev/null differ diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/94/0576e482f2193afad72ea2205c05fd01507e1a b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/94/0576e482f2193afad72ea2205c05fd01507e1a deleted file mode 100644 index 65f78d291..000000000 --- a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/94/0576e482f2193afad72ea2205c05fd01507e1a +++ /dev/null @@ -1,4 +0,0 @@ -xM -0@a9tҀU1LR"x|{odkm`C -FI"X]TDNC-^G -)PfCBcl suq9UGEßfOSUoXFOcEDsseUk~n:` \ No newline at end of file diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06d..000000000 Binary files a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c and /dev/null differ diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 +++ /dev/null @@ -1,2 +0,0 @@ -x+)JMU03c040031QHI5`ֶww.hT[H - yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 deleted file mode 100644 index 01ce23cee..000000000 Binary files a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 and /dev/null differ diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/reflogHardReset/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a deleted file mode 100644 index 08edf28f3..000000000 Binary files a/test/integration/reflogHardReset/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a and /dev/null differ diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/refs/heads/branch2 b/test/integration/reflogHardReset/expected/repo/.git_keep/refs/heads/branch2 deleted file mode 100644 index 9a9e37446..000000000 --- a/test/integration/reflogHardReset/expected/repo/.git_keep/refs/heads/branch2 +++ /dev/null @@ -1 +0,0 @@ -3e0b28f0bcdd445c5f6d6b80b7a42f6fa8a536d2 diff --git a/test/integration/reflogHardReset/expected/repo/.git_keep/refs/heads/master b/test/integration/reflogHardReset/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index ebc65e0dd..000000000 --- a/test/integration/reflogHardReset/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -16fc0fdb6ae48d0bdffbfa7013410227e5fac6f3 diff --git a/test/integration/reflogHardReset/expected/repo/file0 b/test/integration/reflogHardReset/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/reflogHardReset/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/reflogHardReset/expected/repo/file1 b/test/integration/reflogHardReset/expected/repo/file1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/reflogHardReset/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/reflogHardReset/expected/repo/file2 b/test/integration/reflogHardReset/expected/repo/file2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/reflogHardReset/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/reflogHardReset/expected/repo/file4 b/test/integration/reflogHardReset/expected/repo/file4 deleted file mode 100644 index e5c5c5583..000000000 --- a/test/integration/reflogHardReset/expected/repo/file4 +++ /dev/null @@ -1,2 +0,0 @@ -line one -line two diff --git a/test/integration/reflogHardReset/recording.json b/test/integration/reflogHardReset/recording.json deleted file mode 100644 index d0ea679cd..000000000 --- a/test/integration/reflogHardReset/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":1017,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1296,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1857,"Mod":0,"Key":256,"Ch":93},{"Timestamp":2360,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2680,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3928,"Mod":0,"Key":256,"Ch":103},{"Timestamp":4296,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4448,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4752,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5656,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/reflogHardReset/setup.sh b/test/integration/reflogHardReset/setup.sh deleted file mode 100644 index 4cd444a1f..000000000 --- a/test/integration/reflogHardReset/setup.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -echo test0 > file0 -git add . -git commit -am file0 - -echo test1 > file1 -git add . -git commit -am file1 - -echo test2 > file2 -git add . -git commit -am file2 - -echo "line one" > file4 -git add . -git commit -am file4 - -git checkout -b branch2 - -echo "line two" >> file4 -git add . -git commit -am file4 - -echo "line three" >> file4 -git add . -git commit -am file4 - -echo "line two" >> file2 -git add . -git commit -am file2 diff --git a/test/integration/reflogHardReset/test.json b/test/integration/reflogHardReset/test.json deleted file mode 100644 index 84304a953..000000000 --- a/test/integration/reflogHardReset/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "Hard resetting to commit in the reflog", "speed": 10 } diff --git a/test/integration/resetAuthor/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/resetAuthor/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index f4b7a0e26..000000000 --- a/test/integration/resetAuthor/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -myfile2 diff --git a/test/integration/resetAuthor/expected/repo/.git_keep/FETCH_HEAD b/test/integration/resetAuthor/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/resetAuthor/expected/repo/.git_keep/HEAD b/test/integration/resetAuthor/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/resetAuthor/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/resetAuthor/expected/repo/.git_keep/config b/test/integration/resetAuthor/expected/repo/.git_keep/config deleted file mode 100644 index 85e571409..000000000 --- a/test/integration/resetAuthor/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = Author2@example.com - name = Author2 diff --git a/test/integration/resetAuthor/expected/repo/.git_keep/description b/test/integration/resetAuthor/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/resetAuthor/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/resetAuthor/expected/repo/.git_keep/index b/test/integration/resetAuthor/expected/repo/.git_keep/index deleted file mode 100644 index d28ffa71e..000000000 Binary files a/test/integration/resetAuthor/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/resetAuthor/expected/repo/.git_keep/info/exclude b/test/integration/resetAuthor/expected/repo/.git_keep/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/test/integration/resetAuthor/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,6 +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] -# *~ diff --git a/test/integration/resetAuthor/expected/repo/.git_keep/logs/HEAD b/test/integration/resetAuthor/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 882fa7c0e..000000000 --- a/test/integration/resetAuthor/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 291bcc7e708303b395f52245ec988ddbc985bae3 Author1 1651932821 +0200 commit (initial): myfile1 -291bcc7e708303b395f52245ec988ddbc985bae3 63aff3f0f54955ea149f9c2f3c07697b8864940d Author1 1651932821 +0200 commit: myfile2 -63aff3f0f54955ea149f9c2f3c07697b8864940d 0714eb875f11c56a2dc8c53c148889fe43602349 Author2 1651932824 +0200 commit (amend): myfile2 diff --git a/test/integration/resetAuthor/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/resetAuthor/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 882fa7c0e..000000000 --- a/test/integration/resetAuthor/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 291bcc7e708303b395f52245ec988ddbc985bae3 Author1 1651932821 +0200 commit (initial): myfile1 -291bcc7e708303b395f52245ec988ddbc985bae3 63aff3f0f54955ea149f9c2f3c07697b8864940d Author1 1651932821 +0200 commit: myfile2 -63aff3f0f54955ea149f9c2f3c07697b8864940d 0714eb875f11c56a2dc8c53c148889fe43602349 Author2 1651932824 +0200 commit (amend): myfile2 diff --git a/test/integration/resetAuthor/expected/repo/.git_keep/objects/07/14eb875f11c56a2dc8c53c148889fe43602349 b/test/integration/resetAuthor/expected/repo/.git_keep/objects/07/14eb875f11c56a2dc8c53c148889fe43602349 deleted file mode 100644 index c355bd74a..000000000 Binary files a/test/integration/resetAuthor/expected/repo/.git_keep/objects/07/14eb875f11c56a2dc8c53c148889fe43602349 and /dev/null differ diff --git a/test/integration/resetAuthor/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/resetAuthor/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/resetAuthor/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/resetAuthor/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/resetAuthor/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/resetAuthor/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/resetAuthor/expected/repo/.git_keep/objects/29/1bcc7e708303b395f52245ec988ddbc985bae3 b/test/integration/resetAuthor/expected/repo/.git_keep/objects/29/1bcc7e708303b395f52245ec988ddbc985bae3 deleted file mode 100644 index a351f8296..000000000 --- a/test/integration/resetAuthor/expected/repo/.git_keep/objects/29/1bcc7e708303b395f52245ec988ddbc985bae3 +++ /dev/null @@ -1,2 +0,0 @@ -xQ -0D)_lݦ G&,tz{xfx0oR5[ S4kDs X&ZhLE<۽pW{lzJ.];<>x:wM:{uSt5' \ No newline at end of file diff --git a/test/integration/resetAuthor/expected/repo/.git_keep/objects/63/aff3f0f54955ea149f9c2f3c07697b8864940d b/test/integration/resetAuthor/expected/repo/.git_keep/objects/63/aff3f0f54955ea149f9c2f3c07697b8864940d deleted file mode 100644 index 3d713469f..000000000 --- a/test/integration/resetAuthor/expected/repo/.git_keep/objects/63/aff3f0f54955ea149f9c2f3c07697b8864940d +++ /dev/null @@ -1,2 +0,0 @@ -xK -1] $=iѣ3 xP5;]D:)E2Dd*: ]#dH9O2`M}KJI>E*>} \۶)<ŀQc">dB \ No newline at end of file diff --git a/test/integration/resetAuthor/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/resetAuthor/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/resetAuthor/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/resetAuthor/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/resetAuthor/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/resetAuthor/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/resetAuthor/expected/repo/.git_keep/refs/heads/master b/test/integration/resetAuthor/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 73d857f01..000000000 --- a/test/integration/resetAuthor/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0714eb875f11c56a2dc8c53c148889fe43602349 diff --git a/test/integration/resetAuthor/expected/repo/myfile1 b/test/integration/resetAuthor/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/resetAuthor/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/resetAuthor/expected/repo/myfile2 b/test/integration/resetAuthor/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/resetAuthor/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/resetAuthor/recording.json b/test/integration/resetAuthor/recording.json deleted file mode 100644 index 40a1552ac..000000000 --- a/test/integration/resetAuthor/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":638,"Mod":0,"Key":256,"Ch":52},{"Timestamp":1406,"Mod":0,"Key":256,"Ch":97},{"Timestamp":2584,"Mod":0,"Key":256,"Ch":121},{"Timestamp":5654,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":117,"Height":83}]} \ No newline at end of file diff --git a/test/integration/resetAuthor/setup.sh b/test/integration/resetAuthor/setup.sh deleted file mode 100644 index a521883c1..000000000 --- a/test/integration/resetAuthor/setup.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "Author1@example.com" -git config user.name "Author1" - -echo test1 > myfile1 -git add . -git commit -am "myfile1" -echo test2 > myfile2 -git add . -git commit -am "myfile2" - -git config user.email "Author2@example.com" -git config user.name "Author2" diff --git a/test/integration/resetAuthor/test.json b/test/integration/resetAuthor/test.json deleted file mode 100644 index 8e14c4d8e..000000000 --- a/test/integration/resetAuthor/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "In this test the author of a commit is reset to a different name/email.", "speed": 5 } diff --git a/test/integration/searching/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/searching/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index d72af3146..000000000 --- a/test/integration/searching/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -asd diff --git a/test/integration/searching/expected/repo/.git_keep/FETCH_HEAD b/test/integration/searching/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/searching/expected/repo/.git_keep/HEAD b/test/integration/searching/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/searching/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/searching/expected/repo/.git_keep/config b/test/integration/searching/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/searching/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/searching/expected/repo/.git_keep/description b/test/integration/searching/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/searching/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/searching/expected/repo/.git_keep/index b/test/integration/searching/expected/repo/.git_keep/index deleted file mode 100644 index 8c9f1df2b..000000000 Binary files a/test/integration/searching/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/searching/expected/repo/.git_keep/info/exclude b/test/integration/searching/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/searching/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/searching/expected/repo/.git_keep/logs/HEAD b/test/integration/searching/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 84a0ee396..000000000 --- a/test/integration/searching/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 f05f4d92d7babb2f40ebd2829dccee0afff44c70 CI 1617671505 +1000 commit (initial): myfile1 -f05f4d92d7babb2f40ebd2829dccee0afff44c70 6b94b71598d5aa96357ab261599cfd99a4c2c9d0 CI 1617671505 +1000 commit: myfile2 -6b94b71598d5aa96357ab261599cfd99a4c2c9d0 5fb9c54526790a11246b733354bf896da8ffc09d CI 1617671505 +1000 commit: myfile3 -5fb9c54526790a11246b733354bf896da8ffc09d fc759ce6e48e0012eab3f02ec3524a55be938dd5 CI 1617671505 +1000 commit: myfile4 -fc759ce6e48e0012eab3f02ec3524a55be938dd5 3ec60bb22aa39d08428e57e3251563f797b40fc8 CI 1617671517 +1000 commit: asd diff --git a/test/integration/searching/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/searching/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 84a0ee396..000000000 --- a/test/integration/searching/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 f05f4d92d7babb2f40ebd2829dccee0afff44c70 CI 1617671505 +1000 commit (initial): myfile1 -f05f4d92d7babb2f40ebd2829dccee0afff44c70 6b94b71598d5aa96357ab261599cfd99a4c2c9d0 CI 1617671505 +1000 commit: myfile2 -6b94b71598d5aa96357ab261599cfd99a4c2c9d0 5fb9c54526790a11246b733354bf896da8ffc09d CI 1617671505 +1000 commit: myfile3 -5fb9c54526790a11246b733354bf896da8ffc09d fc759ce6e48e0012eab3f02ec3524a55be938dd5 CI 1617671505 +1000 commit: myfile4 -fc759ce6e48e0012eab3f02ec3524a55be938dd5 3ec60bb22aa39d08428e57e3251563f797b40fc8 CI 1617671517 +1000 commit: asd diff --git a/test/integration/searching/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/searching/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/searching/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/searching/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/searching/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/searching/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/searching/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/searching/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/searching/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/searching/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/searching/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba..000000000 Binary files a/test/integration/searching/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 and /dev/null differ diff --git a/test/integration/searching/expected/repo/.git_keep/objects/33/f3da8081c87015eb5b43b148362af87ce6011c b/test/integration/searching/expected/repo/.git_keep/objects/33/f3da8081c87015eb5b43b148362af87ce6011c deleted file mode 100644 index 36207db40..000000000 Binary files a/test/integration/searching/expected/repo/.git_keep/objects/33/f3da8081c87015eb5b43b148362af87ce6011c and /dev/null differ diff --git a/test/integration/searching/expected/repo/.git_keep/objects/3e/c60bb22aa39d08428e57e3251563f797b40fc8 b/test/integration/searching/expected/repo/.git_keep/objects/3e/c60bb22aa39d08428e57e3251563f797b40fc8 deleted file mode 100644 index c20549cea..000000000 Binary files a/test/integration/searching/expected/repo/.git_keep/objects/3e/c60bb22aa39d08428e57e3251563f797b40fc8 and /dev/null differ diff --git a/test/integration/searching/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f b/test/integration/searching/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f deleted file mode 100644 index 953241815..000000000 Binary files a/test/integration/searching/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f and /dev/null differ diff --git a/test/integration/searching/expected/repo/.git_keep/objects/5f/b9c54526790a11246b733354bf896da8ffc09d b/test/integration/searching/expected/repo/.git_keep/objects/5f/b9c54526790a11246b733354bf896da8ffc09d deleted file mode 100644 index 925e7d7e9..000000000 --- a/test/integration/searching/expected/repo/.git_keep/objects/5f/b9c54526790a11246b733354bf896da8ffc09d +++ /dev/null @@ -1,2 +0,0 @@ -xM -0F] oDzdcK7GpxkmП!mxPwwRW'Sv`9 yu3 TFe@<[bc;Cmʅv!űa>1F ;Nu3W[ק8o: \ No newline at end of file diff --git a/test/integration/searching/expected/repo/.git_keep/objects/6b/94b71598d5aa96357ab261599cfd99a4c2c9d0 b/test/integration/searching/expected/repo/.git_keep/objects/6b/94b71598d5aa96357ab261599cfd99a4c2c9d0 deleted file mode 100644 index b83e266ba..000000000 --- a/test/integration/searching/expected/repo/.git_keep/objects/6b/94b71598d5aa96357ab261599cfd99a4c2c9d0 +++ /dev/null @@ -1,2 +0,0 @@ -xM -0@a9L#?3Xhl)n╵wHap6XFQ3|%JQY6[Aѫj)gR+])RD0s%I\w'C>m\`֣EDsc˟ܴ΋d=;g \ No newline at end of file diff --git a/test/integration/searching/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/searching/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/searching/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/searching/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/searching/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/searching/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/searching/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/searching/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/searching/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/searching/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/searching/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/searching/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/searching/expected/repo/.git_keep/objects/f0/5f4d92d7babb2f40ebd2829dccee0afff44c70 b/test/integration/searching/expected/repo/.git_keep/objects/f0/5f4d92d7babb2f40ebd2829dccee0afff44c70 deleted file mode 100644 index 4d1e18b15..000000000 --- a/test/integration/searching/expected/repo/.git_keep/objects/f0/5f4d92d7babb2f40ebd2829dccee0afff44c70 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9I#M&XR"~̖r*Jd7Y)J4$gᚲ\zWa>NO$Vf 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" -echo test5 > myfile5 diff --git a/test/integration/searching/test.json b/test/integration/searching/test.json deleted file mode 100644 index 41e095612..000000000 --- a/test/integration/searching/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "" } diff --git a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index d72af3146..000000000 --- a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -asd diff --git a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/FETCH_HEAD b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/HEAD b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/config b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/description b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/searchingInStagingPanel/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/searchingInStagingPanel/expected/repo/.git_keep/index b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/index deleted file mode 100644 index 9f0c187e4..000000000 Binary files a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/info/exclude b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/searchingInStagingPanel/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/searchingInStagingPanel/expected/repo/.git_keep/logs/HEAD b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 307e32726..000000000 --- a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 70dcf03faa734af0278690e1b0f8e767b733d88a CI 1617671518 +1000 commit (initial): myfile1 -70dcf03faa734af0278690e1b0f8e767b733d88a 364e6307f708c6f17d83c7309aaf9a3034210236 CI 1617671530 +1000 commit: asd diff --git a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 307e32726..000000000 --- a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 70dcf03faa734af0278690e1b0f8e767b733d88a CI 1617671518 +1000 commit (initial): myfile1 -70dcf03faa734af0278690e1b0f8e767b733d88a 364e6307f708c6f17d83c7309aaf9a3034210236 CI 1617671530 +1000 commit: asd diff --git a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/16/4d8eaeabbb4b1082fdfb6735be0134535340b2 b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/16/4d8eaeabbb4b1082fdfb6735be0134535340b2 deleted file mode 100644 index c64d709a0..000000000 Binary files a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/16/4d8eaeabbb4b1082fdfb6735be0134535340b2 and /dev/null differ diff --git a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/36/4e6307f708c6f17d83c7309aaf9a3034210236 b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/36/4e6307f708c6f17d83c7309aaf9a3034210236 deleted file mode 100644 index 2a9fc4bd2..000000000 Binary files a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/36/4e6307f708c6f17d83c7309aaf9a3034210236 and /dev/null differ diff --git a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/4e/a1f9142dd3ced7ae2180752f770ce203fb8ac3 b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/4e/a1f9142dd3ced7ae2180752f770ce203fb8ac3 deleted file mode 100644 index 6fb186172..000000000 Binary files a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/4e/a1f9142dd3ced7ae2180752f770ce203fb8ac3 and /dev/null differ diff --git a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/70/dcf03faa734af0278690e1b0f8e767b733d88a b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/70/dcf03faa734af0278690e1b0f8e767b733d88a deleted file mode 100644 index bd6730a28..000000000 --- a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/70/dcf03faa734af0278690e1b0f8e767b733d88a +++ /dev/null @@ -1,2 +0,0 @@ -xA - @Ѯ= eFcBV9TG<պt .}WBNf[1EW^Q34czHVVG@p%D4g=']~˲*A, \ No newline at end of file diff --git a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/88/4971c742724377080ba3d75d4b4d6bceee4e4b b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/88/4971c742724377080ba3d75d4b4d6bceee4e4b deleted file mode 100644 index d68b530a6..000000000 Binary files a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/88/4971c742724377080ba3d75d4b4d6bceee4e4b and /dev/null differ diff --git a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/89/b24ecec50c07aef0d6640a2a9f6dc354a33125 b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/89/b24ecec50c07aef0d6640a2a9f6dc354a33125 deleted file mode 100644 index ba7181154..000000000 Binary files a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/89/b24ecec50c07aef0d6640a2a9f6dc354a33125 and /dev/null differ diff --git a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/9c/2a7090627d0fffa9ed001bf7be98f86c2c8068 b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/9c/2a7090627d0fffa9ed001bf7be98f86c2c8068 deleted file mode 100644 index dfbe7c356..000000000 Binary files a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/9c/2a7090627d0fffa9ed001bf7be98f86c2c8068 and /dev/null differ diff --git a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/a9/2d664bc20a04b1621b1fc893d1196b41182fdf b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/a9/2d664bc20a04b1621b1fc893d1196b41182fdf deleted file mode 100644 index 80eb62ee3..000000000 Binary files a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/a9/2d664bc20a04b1621b1fc893d1196b41182fdf and /dev/null differ diff --git a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/cb/f7f40f0ffe31d36ddc23bc6ce251c66f6f4e87 b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/cb/f7f40f0ffe31d36ddc23bc6ce251c66f6f4e87 deleted file mode 100644 index b2e010024..000000000 Binary files a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/cb/f7f40f0ffe31d36ddc23bc6ce251c66f6f4e87 and /dev/null differ diff --git a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/refs/heads/master b/test/integration/searchingInStagingPanel/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 74947c528..000000000 --- a/test/integration/searchingInStagingPanel/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -364e6307f708c6f17d83c7309aaf9a3034210236 diff --git a/test/integration/searchingInStagingPanel/expected/repo/myfile1 b/test/integration/searchingInStagingPanel/expected/repo/myfile1 deleted file mode 100644 index 9c2a70906..000000000 --- a/test/integration/searchingInStagingPanel/expected/repo/myfile1 +++ /dev/null @@ -1,4 +0,0 @@ -line 1 -line 2 -line 3 -line 4 diff --git a/test/integration/searchingInStagingPanel/recording.json b/test/integration/searchingInStagingPanel/recording.json deleted file mode 100644 index 544c41897..000000000 --- a/test/integration/searchingInStagingPanel/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":635,"Mod":0,"Key":13,"Ch":13},{"Timestamp":1379,"Mod":0,"Key":256,"Ch":47},{"Timestamp":1683,"Mod":0,"Key":256,"Ch":108},{"Timestamp":1707,"Mod":0,"Key":256,"Ch":105},{"Timestamp":1739,"Mod":0,"Key":256,"Ch":110},{"Timestamp":1812,"Mod":0,"Key":256,"Ch":101},{"Timestamp":1884,"Mod":0,"Key":256,"Ch":32},{"Timestamp":2003,"Mod":0,"Key":256,"Ch":51},{"Timestamp":2172,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2532,"Mod":0,"Key":256,"Ch":32},{"Timestamp":3621,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4209,"Mod":0,"Key":27,"Ch":0},{"Timestamp":4723,"Mod":0,"Key":257,"Ch":0},{"Timestamp":5004,"Mod":0,"Key":256,"Ch":32},{"Timestamp":5188,"Mod":0,"Key":257,"Ch":0},{"Timestamp":5636,"Mod":0,"Key":258,"Ch":0},{"Timestamp":5923,"Mod":0,"Key":256,"Ch":32},{"Timestamp":7412,"Mod":0,"Key":256,"Ch":47},{"Timestamp":8027,"Mod":0,"Key":256,"Ch":108},{"Timestamp":8060,"Mod":0,"Key":256,"Ch":105},{"Timestamp":8084,"Mod":0,"Key":256,"Ch":110},{"Timestamp":8139,"Mod":0,"Key":256,"Ch":101},{"Timestamp":8228,"Mod":0,"Key":256,"Ch":32},{"Timestamp":8315,"Mod":0,"Key":256,"Ch":52},{"Timestamp":8556,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8915,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9622,"Mod":0,"Key":27,"Ch":0},{"Timestamp":10414,"Mod":0,"Key":27,"Ch":0},{"Timestamp":11140,"Mod":0,"Key":256,"Ch":99},{"Timestamp":11419,"Mod":0,"Key":256,"Ch":97},{"Timestamp":11500,"Mod":0,"Key":256,"Ch":115},{"Timestamp":11580,"Mod":0,"Key":256,"Ch":100},{"Timestamp":11813,"Mod":0,"Key":13,"Ch":13},{"Timestamp":12276,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":127,"Height":35}]} \ No newline at end of file diff --git a/test/integration/searchingInStagingPanel/setup.sh b/test/integration/searchingInStagingPanel/setup.sh deleted file mode 100644 index e3566ddb9..000000000 --- a/test/integration/searchingInStagingPanel/setup.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -echo "line 1" > myfile1 -git add . -git commit -am "myfile1" - -echo "line 2" >> myfile1 -echo "line 3" >> myfile1 -echo "line 4" >> myfile1 diff --git a/test/integration/searchingInStagingPanel/test.json b/test/integration/searchingInStagingPanel/test.json deleted file mode 100644 index 41e095612..000000000 --- a/test/integration/searchingInStagingPanel/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "" } diff --git a/test/integration/setAuthor/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/setAuthor/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index c23aa0355..000000000 --- a/test/integration/setAuthor/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -myfile3 diff --git a/test/integration/setAuthor/expected/repo/.git_keep/FETCH_HEAD b/test/integration/setAuthor/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/setAuthor/expected/repo/.git_keep/HEAD b/test/integration/setAuthor/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/setAuthor/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/setAuthor/expected/repo/.git_keep/config b/test/integration/setAuthor/expected/repo/.git_keep/config deleted file mode 100644 index 85e571409..000000000 --- a/test/integration/setAuthor/expected/repo/.git_keep/config +++ /dev/null @@ -1,10 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = Author2@example.com - name = Author2 diff --git a/test/integration/setAuthor/expected/repo/.git_keep/description b/test/integration/setAuthor/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/setAuthor/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/setAuthor/expected/repo/.git_keep/index b/test/integration/setAuthor/expected/repo/.git_keep/index deleted file mode 100644 index 78afb6d69..000000000 Binary files a/test/integration/setAuthor/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/setAuthor/expected/repo/.git_keep/info/exclude b/test/integration/setAuthor/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/setAuthor/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/setAuthor/expected/repo/.git_keep/logs/HEAD b/test/integration/setAuthor/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 38d45fb5d..000000000 --- a/test/integration/setAuthor/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 2075aeb39a2a66a9607860a65b2a71c517760254 Author1 1652008089 +1000 commit (initial): myfile1 -2075aeb39a2a66a9607860a65b2a71c517760254 d01c8bb001458d0a7c01193813685c658e0355ac Author1 1652008089 +1000 commit: myfile2 -d01c8bb001458d0a7c01193813685c658e0355ac 8710ece70b7db9638b9645e93abdbcf210fa4595 Author2 1652008089 +1000 commit: myfile3 -8710ece70b7db9638b9645e93abdbcf210fa4595 baf3189129ba8878ba9b4107eaaaf3389287259b Author2 1652008097 +1000 commit (amend): myfile3 diff --git a/test/integration/setAuthor/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/setAuthor/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 38d45fb5d..000000000 --- a/test/integration/setAuthor/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 2075aeb39a2a66a9607860a65b2a71c517760254 Author1 1652008089 +1000 commit (initial): myfile1 -2075aeb39a2a66a9607860a65b2a71c517760254 d01c8bb001458d0a7c01193813685c658e0355ac Author1 1652008089 +1000 commit: myfile2 -d01c8bb001458d0a7c01193813685c658e0355ac 8710ece70b7db9638b9645e93abdbcf210fa4595 Author2 1652008089 +1000 commit: myfile3 -8710ece70b7db9638b9645e93abdbcf210fa4595 baf3189129ba8878ba9b4107eaaaf3389287259b Author2 1652008097 +1000 commit (amend): myfile3 diff --git a/test/integration/setAuthor/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/setAuthor/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/setAuthor/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/setAuthor/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/setAuthor/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/setAuthor/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/setAuthor/expected/repo/.git_keep/objects/20/75aeb39a2a66a9607860a65b2a71c517760254 b/test/integration/setAuthor/expected/repo/.git_keep/objects/20/75aeb39a2a66a9607860a65b2a71c517760254 deleted file mode 100644 index ce4b3233f..000000000 --- a/test/integration/setAuthor/expected/repo/.git_keep/objects/20/75aeb39a2a66a9607860a65b2a71c517760254 +++ /dev/null @@ -1,2 +0,0 @@ -xQ -0D)_ݸn%M6Xhz{xfx0ob-em@"ČAq2MF*I#/|N9l\cSҵGT ~+nFȋ5' \ No newline at end of file diff --git a/test/integration/setAuthor/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/setAuthor/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/setAuthor/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/setAuthor/expected/repo/.git_keep/objects/87/10ece70b7db9638b9645e93abdbcf210fa4595 b/test/integration/setAuthor/expected/repo/.git_keep/objects/87/10ece70b7db9638b9645e93abdbcf210fa4595 deleted file mode 100644 index 573b0d49c..000000000 Binary files a/test/integration/setAuthor/expected/repo/.git_keep/objects/87/10ece70b7db9638b9645e93abdbcf210fa4595 and /dev/null differ diff --git a/test/integration/setAuthor/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/setAuthor/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/setAuthor/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/setAuthor/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/setAuthor/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/setAuthor/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/setAuthor/expected/repo/.git_keep/objects/ba/f3189129ba8878ba9b4107eaaaf3389287259b b/test/integration/setAuthor/expected/repo/.git_keep/objects/ba/f3189129ba8878ba9b4107eaaaf3389287259b deleted file mode 100644 index 18a5ff1cd..000000000 Binary files a/test/integration/setAuthor/expected/repo/.git_keep/objects/ba/f3189129ba8878ba9b4107eaaaf3389287259b and /dev/null differ diff --git a/test/integration/setAuthor/expected/repo/.git_keep/objects/d0/1c8bb001458d0a7c01193813685c658e0355ac b/test/integration/setAuthor/expected/repo/.git_keep/objects/d0/1c8bb001458d0a7c01193813685c658e0355ac deleted file mode 100644 index e9d69bf0f..000000000 Binary files a/test/integration/setAuthor/expected/repo/.git_keep/objects/d0/1c8bb001458d0a7c01193813685c658e0355ac and /dev/null differ diff --git a/test/integration/setAuthor/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/setAuthor/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/setAuthor/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/setAuthor/expected/repo/.git_keep/refs/heads/master b/test/integration/setAuthor/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 2499d7343..000000000 --- a/test/integration/setAuthor/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -baf3189129ba8878ba9b4107eaaaf3389287259b diff --git a/test/integration/setAuthor/expected/repo/myfile1 b/test/integration/setAuthor/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/setAuthor/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/setAuthor/expected/repo/myfile2 b/test/integration/setAuthor/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/setAuthor/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/setAuthor/expected/repo/myfile3 b/test/integration/setAuthor/expected/repo/myfile3 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/setAuthor/expected/repo/myfile3 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/setAuthor/recording.json b/test/integration/setAuthor/recording.json deleted file mode 100644 index 9084af754..000000000 --- a/test/integration/setAuthor/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":1118,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1382,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2654,"Mod":0,"Key":256,"Ch":97},{"Timestamp":3632,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4070,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6702,"Mod":0,"Key":9,"Ch":9},{"Timestamp":7486,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7899,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9141,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/setAuthor/setup.sh b/test/integration/setAuthor/setup.sh deleted file mode 100644 index 2eeb4d549..000000000 --- a/test/integration/setAuthor/setup.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "Author1@example.com" -git config user.name "Author1" - -echo test1 > myfile1 -git add . -git commit -am "myfile1" -echo test2 > myfile2 -git add . -git commit -am "myfile2" - -git config user.email "Author2@example.com" -git config user.name "Author2" - -echo test3 > myfile3 -git add . -git commit -am "myfile3" diff --git a/test/integration/setAuthor/test.json b/test/integration/setAuthor/test.json deleted file mode 100644 index c8426b12c..000000000 --- a/test/integration/setAuthor/test.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "description": "In this test the author of a commit is set to a different name/email.", - "speed": 5 -} diff --git a/test/integration/setUpstream/expected/origin/HEAD b/test/integration/setUpstream/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/setUpstream/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/setUpstream/expected/origin/config b/test/integration/setUpstream/expected/origin/config deleted file mode 100644 index f97482c61..000000000 --- a/test/integration/setUpstream/expected/origin/config +++ /dev/null @@ -1,6 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true -[remote "origin"] - url = /home/mark/Downloads/gits/lazygit/test/integration/setUpstream/actual/./repo diff --git a/test/integration/setUpstream/expected/origin/description b/test/integration/setUpstream/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/setUpstream/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/setUpstream/expected/origin/info/exclude b/test/integration/setUpstream/expected/origin/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/test/integration/setUpstream/expected/origin/info/exclude +++ /dev/null @@ -1,6 +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] -# *~ diff --git a/test/integration/setUpstream/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/setUpstream/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/setUpstream/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/setUpstream/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/setUpstream/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/setUpstream/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/setUpstream/expected/origin/objects/27/58cffdc0d931ff3a3d6c58b75f91ec42981dcf b/test/integration/setUpstream/expected/origin/objects/27/58cffdc0d931ff3a3d6c58b75f91ec42981dcf deleted file mode 100644 index 099d02445..000000000 Binary files a/test/integration/setUpstream/expected/origin/objects/27/58cffdc0d931ff3a3d6c58b75f91ec42981dcf and /dev/null differ diff --git a/test/integration/setUpstream/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/setUpstream/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/setUpstream/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/setUpstream/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/setUpstream/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba..000000000 Binary files a/test/integration/setUpstream/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 and /dev/null differ diff --git a/test/integration/setUpstream/expected/origin/objects/6d/51185514ab4f80b42f17013295c261f92a66f0 b/test/integration/setUpstream/expected/origin/objects/6d/51185514ab4f80b42f17013295c261f92a66f0 deleted file mode 100644 index d9b4d87b9..000000000 Binary files a/test/integration/setUpstream/expected/origin/objects/6d/51185514ab4f80b42f17013295c261f92a66f0 and /dev/null differ diff --git a/test/integration/setUpstream/expected/origin/objects/9c/663d29d26a71dd67e3bf7b1f2ea73f4939d9e0 b/test/integration/setUpstream/expected/origin/objects/9c/663d29d26a71dd67e3bf7b1f2ea73f4939d9e0 deleted file mode 100644 index 7965d6afb..000000000 --- a/test/integration/setUpstream/expected/origin/objects/9c/663d29d26a71dd67e3bf7b1f2ea73f4939d9e0 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0@Q9i -"BW=FL!R"~r*JdFY)JՁr.0p~6fw e t;uSr?2X, \ No newline at end of file diff --git a/test/integration/setUpstream/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/setUpstream/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/setUpstream/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/setUpstream/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/setUpstream/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/setUpstream/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/setUpstream/expected/origin/objects/ce/3220d7b3cbc57811e3e6169349c611f62a7c42 b/test/integration/setUpstream/expected/origin/objects/ce/3220d7b3cbc57811e3e6169349c611f62a7c42 deleted file mode 100644 index 19012a4aa..000000000 Binary files a/test/integration/setUpstream/expected/origin/objects/ce/3220d7b3cbc57811e3e6169349c611f62a7c42 and /dev/null differ diff --git a/test/integration/setUpstream/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/setUpstream/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/setUpstream/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/setUpstream/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/setUpstream/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/setUpstream/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/setUpstream/expected/origin/packed-refs b/test/integration/setUpstream/expected/origin/packed-refs deleted file mode 100644 index f854ff120..000000000 --- a/test/integration/setUpstream/expected/origin/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -ce3220d7b3cbc57811e3e6169349c611f62a7c42 refs/heads/master diff --git a/test/integration/setUpstream/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/setUpstream/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 51be8ec3d..000000000 --- a/test/integration/setUpstream/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -myfile4 diff --git a/test/integration/setUpstream/expected/repo/.git_keep/FETCH_HEAD b/test/integration/setUpstream/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index b60b7b2a0..000000000 --- a/test/integration/setUpstream/expected/repo/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -ce3220d7b3cbc57811e3e6169349c611f62a7c42 not-for-merge branch 'master' of ../origin diff --git a/test/integration/setUpstream/expected/repo/.git_keep/HEAD b/test/integration/setUpstream/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/setUpstream/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/setUpstream/expected/repo/.git_keep/ORIG_HEAD b/test/integration/setUpstream/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 6e2a4de9b..000000000 --- a/test/integration/setUpstream/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -ce3220d7b3cbc57811e3e6169349c611f62a7c42 diff --git a/test/integration/setUpstream/expected/repo/.git_keep/config b/test/integration/setUpstream/expected/repo/.git_keep/config deleted file mode 100644 index 64b94ff0f..000000000 --- a/test/integration/setUpstream/expected/repo/.git_keep/config +++ /dev/null @@ -1,14 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = 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 diff --git a/test/integration/setUpstream/expected/repo/.git_keep/description b/test/integration/setUpstream/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/setUpstream/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/setUpstream/expected/repo/.git_keep/index b/test/integration/setUpstream/expected/repo/.git_keep/index deleted file mode 100644 index 25d846403..000000000 Binary files a/test/integration/setUpstream/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/setUpstream/expected/repo/.git_keep/info/exclude b/test/integration/setUpstream/expected/repo/.git_keep/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/test/integration/setUpstream/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,6 +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] -# *~ diff --git a/test/integration/setUpstream/expected/repo/.git_keep/logs/HEAD b/test/integration/setUpstream/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 300481fb2..000000000 --- a/test/integration/setUpstream/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 9c663d29d26a71dd67e3bf7b1f2ea73f4939d9e0 CI 1650269554 +0200 commit (initial): myfile1 -9c663d29d26a71dd67e3bf7b1f2ea73f4939d9e0 6d51185514ab4f80b42f17013295c261f92a66f0 CI 1650269554 +0200 commit: myfile2 -6d51185514ab4f80b42f17013295c261f92a66f0 2758cffdc0d931ff3a3d6c58b75f91ec42981dcf CI 1650269554 +0200 commit: myfile3 -2758cffdc0d931ff3a3d6c58b75f91ec42981dcf ce3220d7b3cbc57811e3e6169349c611f62a7c42 CI 1650269554 +0200 commit: myfile4 -ce3220d7b3cbc57811e3e6169349c611f62a7c42 6d51185514ab4f80b42f17013295c261f92a66f0 CI 1650269554 +0200 reset: moving to HEAD~2 diff --git a/test/integration/setUpstream/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/setUpstream/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 300481fb2..000000000 --- a/test/integration/setUpstream/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 9c663d29d26a71dd67e3bf7b1f2ea73f4939d9e0 CI 1650269554 +0200 commit (initial): myfile1 -9c663d29d26a71dd67e3bf7b1f2ea73f4939d9e0 6d51185514ab4f80b42f17013295c261f92a66f0 CI 1650269554 +0200 commit: myfile2 -6d51185514ab4f80b42f17013295c261f92a66f0 2758cffdc0d931ff3a3d6c58b75f91ec42981dcf CI 1650269554 +0200 commit: myfile3 -2758cffdc0d931ff3a3d6c58b75f91ec42981dcf ce3220d7b3cbc57811e3e6169349c611f62a7c42 CI 1650269554 +0200 commit: myfile4 -ce3220d7b3cbc57811e3e6169349c611f62a7c42 6d51185514ab4f80b42f17013295c261f92a66f0 CI 1650269554 +0200 reset: moving to HEAD~2 diff --git a/test/integration/setUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/setUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index ade370956..000000000 --- a/test/integration/setUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 ce3220d7b3cbc57811e3e6169349c611f62a7c42 CI 1650269559 +0200 fetch origin: storing head diff --git a/test/integration/setUpstream/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/setUpstream/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/setUpstream/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/setUpstream/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/setUpstream/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/setUpstream/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/setUpstream/expected/repo/.git_keep/objects/27/58cffdc0d931ff3a3d6c58b75f91ec42981dcf b/test/integration/setUpstream/expected/repo/.git_keep/objects/27/58cffdc0d931ff3a3d6c58b75f91ec42981dcf deleted file mode 100644 index 099d02445..000000000 Binary files a/test/integration/setUpstream/expected/repo/.git_keep/objects/27/58cffdc0d931ff3a3d6c58b75f91ec42981dcf and /dev/null differ diff --git a/test/integration/setUpstream/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/setUpstream/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/setUpstream/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/setUpstream/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/setUpstream/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba..000000000 Binary files a/test/integration/setUpstream/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 and /dev/null differ diff --git a/test/integration/setUpstream/expected/repo/.git_keep/objects/6d/51185514ab4f80b42f17013295c261f92a66f0 b/test/integration/setUpstream/expected/repo/.git_keep/objects/6d/51185514ab4f80b42f17013295c261f92a66f0 deleted file mode 100644 index d9b4d87b9..000000000 Binary files a/test/integration/setUpstream/expected/repo/.git_keep/objects/6d/51185514ab4f80b42f17013295c261f92a66f0 and /dev/null differ diff --git a/test/integration/setUpstream/expected/repo/.git_keep/objects/9c/663d29d26a71dd67e3bf7b1f2ea73f4939d9e0 b/test/integration/setUpstream/expected/repo/.git_keep/objects/9c/663d29d26a71dd67e3bf7b1f2ea73f4939d9e0 deleted file mode 100644 index 7965d6afb..000000000 --- a/test/integration/setUpstream/expected/repo/.git_keep/objects/9c/663d29d26a71dd67e3bf7b1f2ea73f4939d9e0 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0@Q9i -"BW=FL!R"~r*JdFY)JՁr.0p~6fw e t;uSr?2X, \ No newline at end of file diff --git a/test/integration/setUpstream/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/setUpstream/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/setUpstream/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/setUpstream/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/setUpstream/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/setUpstream/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/setUpstream/expected/repo/.git_keep/objects/ce/3220d7b3cbc57811e3e6169349c611f62a7c42 b/test/integration/setUpstream/expected/repo/.git_keep/objects/ce/3220d7b3cbc57811e3e6169349c611f62a7c42 deleted file mode 100644 index 19012a4aa..000000000 Binary files a/test/integration/setUpstream/expected/repo/.git_keep/objects/ce/3220d7b3cbc57811e3e6169349c611f62a7c42 and /dev/null differ diff --git a/test/integration/setUpstream/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/setUpstream/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/setUpstream/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/setUpstream/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/setUpstream/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/setUpstream/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/setUpstream/expected/repo/.git_keep/refs/heads/master b/test/integration/setUpstream/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 0147cfa3f..000000000 --- a/test/integration/setUpstream/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -6d51185514ab4f80b42f17013295c261f92a66f0 diff --git a/test/integration/setUpstream/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/setUpstream/expected/repo/.git_keep/refs/remotes/origin/master deleted file mode 100644 index 6e2a4de9b..000000000 --- a/test/integration/setUpstream/expected/repo/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -ce3220d7b3cbc57811e3e6169349c611f62a7c42 diff --git a/test/integration/setUpstream/expected/repo/myfile1 b/test/integration/setUpstream/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/setUpstream/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/setUpstream/expected/repo/myfile2 b/test/integration/setUpstream/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/setUpstream/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/setUpstream/recording.json b/test/integration/setUpstream/recording.json deleted file mode 100644 index a84937cc7..000000000 --- a/test/integration/setUpstream/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":558,"Mod":0,"Key":256,"Ch":108},{"Timestamp":992,"Mod":0,"Key":256,"Ch":93},{"Timestamp":1583,"Mod":0,"Key":256,"Ch":110},{"Timestamp":2109,"Mod":0,"Key":256,"Ch":111},{"Timestamp":2232,"Mod":0,"Key":256,"Ch":114},{"Timestamp":2278,"Mod":0,"Key":256,"Ch":105},{"Timestamp":2413,"Mod":0,"Key":256,"Ch":103},{"Timestamp":2478,"Mod":0,"Key":256,"Ch":105},{"Timestamp":2538,"Mod":0,"Key":256,"Ch":110},{"Timestamp":2831,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3060,"Mod":0,"Key":256,"Ch":46},{"Timestamp":3234,"Mod":0,"Key":256,"Ch":46},{"Timestamp":3293,"Mod":0,"Key":256,"Ch":47},{"Timestamp":3454,"Mod":0,"Key":256,"Ch":111},{"Timestamp":3594,"Mod":0,"Key":256,"Ch":114},{"Timestamp":3632,"Mod":0,"Key":256,"Ch":105},{"Timestamp":3780,"Mod":0,"Key":256,"Ch":103},{"Timestamp":3831,"Mod":0,"Key":256,"Ch":105},{"Timestamp":3890,"Mod":0,"Key":256,"Ch":110},{"Timestamp":4150,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4695,"Mod":0,"Key":256,"Ch":102},{"Timestamp":5433,"Mod":0,"Key":256,"Ch":91},{"Timestamp":6106,"Mod":0,"Key":256,"Ch":117},{"Timestamp":6884,"Mod":0,"Key":256,"Ch":115},{"Timestamp":7833,"Mod":0,"Key":9,"Ch":9},{"Timestamp":8301,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9114,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":239,"Height":55}]} \ No newline at end of file diff --git a/test/integration/setUpstream/setup.sh b/test/integration/setUpstream/setup.sh deleted file mode 100644 index d0bc91327..000000000 --- a/test/integration/setUpstream/setup.sh +++ /dev/null @@ -1,32 +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 diff --git a/test/integration/setUpstream/test.json b/test/integration/setUpstream/test.json deleted file mode 100644 index 32b4b9d64..000000000 --- a/test/integration/setUpstream/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "allow setting the upstream of the current branch", "speed": 10 } diff --git a/test/integration/setUpstreamThroughPush/expected/origin/HEAD b/test/integration/setUpstreamThroughPush/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/setUpstreamThroughPush/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/setUpstreamThroughPush/expected/origin/config b/test/integration/setUpstreamThroughPush/expected/origin/config deleted file mode 100644 index 63958f045..000000000 --- a/test/integration/setUpstreamThroughPush/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/setUpstream/actual/./repo diff --git a/test/integration/setUpstreamThroughPush/expected/origin/description b/test/integration/setUpstreamThroughPush/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/setUpstreamThroughPush/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/setUpstreamThroughPush/expected/origin/info/exclude b/test/integration/setUpstreamThroughPush/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/setUpstreamThroughPush/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/setUpstreamThroughPush/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/setUpstreamThroughPush/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/setUpstreamThroughPush/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/setUpstreamThroughPush/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/setUpstreamThroughPush/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/setUpstreamThroughPush/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/setUpstreamThroughPush/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/setUpstreamThroughPush/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/setUpstreamThroughPush/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/setUpstreamThroughPush/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/setUpstreamThroughPush/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba..000000000 Binary files a/test/integration/setUpstreamThroughPush/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 and /dev/null differ diff --git a/test/integration/setUpstreamThroughPush/expected/origin/objects/30/ef3df33d31f0b98298881be4dbe69c54758ba2 b/test/integration/setUpstreamThroughPush/expected/origin/objects/30/ef3df33d31f0b98298881be4dbe69c54758ba2 deleted file mode 100644 index a6fdc2a4b..000000000 Binary files a/test/integration/setUpstreamThroughPush/expected/origin/objects/30/ef3df33d31f0b98298881be4dbe69c54758ba2 and /dev/null differ diff --git a/test/integration/setUpstreamThroughPush/expected/origin/objects/63/05259d1908bee46b3b686702ed55b6f12e9ba2 b/test/integration/setUpstreamThroughPush/expected/origin/objects/63/05259d1908bee46b3b686702ed55b6f12e9ba2 deleted file mode 100644 index 30dddbf70..000000000 --- a/test/integration/setUpstreamThroughPush/expected/origin/objects/63/05259d1908bee46b3b686702ed55b6f12e9ba2 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9$icL!R"~H|*x\2^5"%a#- S<'l;L3ܦצȔ"q"wG=&]ξu27, \ No newline at end of file diff --git a/test/integration/setUpstreamThroughPush/expected/origin/objects/a2/6a9d22097eb77a8cf2fbb18512aa44c0c536a2 b/test/integration/setUpstreamThroughPush/expected/origin/objects/a2/6a9d22097eb77a8cf2fbb18512aa44c0c536a2 deleted file mode 100644 index e17ab2106..000000000 --- a/test/integration/setUpstreamThroughPush/expected/origin/objects/a2/6a9d22097eb77a8cf2fbb18512aa44c0c536a2 +++ /dev/null @@ -1,4 +0,0 @@ -xA -0@Q9LiDz`R"~kkK*yLA-E -̎#1l+yd]_@A -Ysv#"D&ca:Nw=2>:5G=Md~9 \ No newline at end of file diff --git a/test/integration/setUpstreamThroughPush/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/setUpstreamThroughPush/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/setUpstreamThroughPush/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/setUpstreamThroughPush/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/setUpstreamThroughPush/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/setUpstreamThroughPush/expected/origin/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/setUpstreamThroughPush/expected/origin/objects/c6/ffcbed8902934d462722ff6ef471813b9a4df5 b/test/integration/setUpstreamThroughPush/expected/origin/objects/c6/ffcbed8902934d462722ff6ef471813b9a4df5 deleted file mode 100644 index 714f1dd9d..000000000 Binary files a/test/integration/setUpstreamThroughPush/expected/origin/objects/c6/ffcbed8902934d462722ff6ef471813b9a4df5 and /dev/null differ diff --git a/test/integration/setUpstreamThroughPush/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/setUpstreamThroughPush/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/setUpstreamThroughPush/expected/origin/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/setUpstreamThroughPush/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/setUpstreamThroughPush/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/setUpstreamThroughPush/expected/origin/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/setUpstreamThroughPush/expected/origin/packed-refs b/test/integration/setUpstreamThroughPush/expected/origin/packed-refs deleted file mode 100644 index 300d293d2..000000000 --- a/test/integration/setUpstreamThroughPush/expected/origin/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -30ef3df33d31f0b98298881be4dbe69c54758ba2 refs/heads/master diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 51be8ec3d..000000000 --- a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -myfile4 diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/FETCH_HEAD b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index 125d82b6f..000000000 --- a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -30ef3df33d31f0b98298881be4dbe69c54758ba2 branch 'master' of ../origin diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/HEAD b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/ORIG_HEAD b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 0b53f05ce..000000000 --- a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -a26a9d22097eb77a8cf2fbb18512aa44c0c536a2 diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/config b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/config deleted file mode 100644 index 7721ae814..000000000 --- a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/config +++ /dev/null @@ -1,16 +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 diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/description b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/setUpstreamThroughPush/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/setUpstreamThroughPush/expected/repo/.git_keep/index b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/index deleted file mode 100644 index 99e8224eb..000000000 Binary files a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/info/exclude b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/setUpstreamThroughPush/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/setUpstreamThroughPush/expected/repo/.git_keep/logs/HEAD b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index aba248ca8..000000000 --- a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 6305259d1908bee46b3b686702ed55b6f12e9ba2 CI 1648346253 +1100 commit (initial): myfile1 -6305259d1908bee46b3b686702ed55b6f12e9ba2 a26a9d22097eb77a8cf2fbb18512aa44c0c536a2 CI 1648346253 +1100 commit: myfile2 -a26a9d22097eb77a8cf2fbb18512aa44c0c536a2 c6ffcbed8902934d462722ff6ef471813b9a4df5 CI 1648346253 +1100 commit: myfile3 -c6ffcbed8902934d462722ff6ef471813b9a4df5 30ef3df33d31f0b98298881be4dbe69c54758ba2 CI 1648346253 +1100 commit: myfile4 -30ef3df33d31f0b98298881be4dbe69c54758ba2 a26a9d22097eb77a8cf2fbb18512aa44c0c536a2 CI 1648346253 +1100 reset: moving to HEAD~2 -a26a9d22097eb77a8cf2fbb18512aa44c0c536a2 30ef3df33d31f0b98298881be4dbe69c54758ba2 CI 1648346262 +1100 rebase -i (start): checkout 30ef3df33d31f0b98298881be4dbe69c54758ba2 -30ef3df33d31f0b98298881be4dbe69c54758ba2 30ef3df33d31f0b98298881be4dbe69c54758ba2 CI 1648346262 +1100 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index e0e98143e..000000000 --- a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,6 +0,0 @@ -0000000000000000000000000000000000000000 6305259d1908bee46b3b686702ed55b6f12e9ba2 CI 1648346253 +1100 commit (initial): myfile1 -6305259d1908bee46b3b686702ed55b6f12e9ba2 a26a9d22097eb77a8cf2fbb18512aa44c0c536a2 CI 1648346253 +1100 commit: myfile2 -a26a9d22097eb77a8cf2fbb18512aa44c0c536a2 c6ffcbed8902934d462722ff6ef471813b9a4df5 CI 1648346253 +1100 commit: myfile3 -c6ffcbed8902934d462722ff6ef471813b9a4df5 30ef3df33d31f0b98298881be4dbe69c54758ba2 CI 1648346253 +1100 commit: myfile4 -30ef3df33d31f0b98298881be4dbe69c54758ba2 a26a9d22097eb77a8cf2fbb18512aa44c0c536a2 CI 1648346253 +1100 reset: moving to HEAD~2 -a26a9d22097eb77a8cf2fbb18512aa44c0c536a2 30ef3df33d31f0b98298881be4dbe69c54758ba2 CI 1648346262 +1100 rebase -i (finish): refs/heads/master onto 30ef3df33d31f0b98298881be4dbe69c54758ba2 diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 774c65ed0..000000000 --- a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 30ef3df33d31f0b98298881be4dbe69c54758ba2 CI 1648346260 +1100 fetch origin: storing head diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba..000000000 Binary files a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 and /dev/null differ diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/30/ef3df33d31f0b98298881be4dbe69c54758ba2 b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/30/ef3df33d31f0b98298881be4dbe69c54758ba2 deleted file mode 100644 index a6fdc2a4b..000000000 Binary files a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/30/ef3df33d31f0b98298881be4dbe69c54758ba2 and /dev/null differ diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/63/05259d1908bee46b3b686702ed55b6f12e9ba2 b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/63/05259d1908bee46b3b686702ed55b6f12e9ba2 deleted file mode 100644 index 30dddbf70..000000000 --- a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/63/05259d1908bee46b3b686702ed55b6f12e9ba2 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9$icL!R"~H|*x\2^5"%a#- S<'l;L3ܦצȔ"q"wG=&]ξu27, \ No newline at end of file diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/a2/6a9d22097eb77a8cf2fbb18512aa44c0c536a2 b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/a2/6a9d22097eb77a8cf2fbb18512aa44c0c536a2 deleted file mode 100644 index e17ab2106..000000000 --- a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/a2/6a9d22097eb77a8cf2fbb18512aa44c0c536a2 +++ /dev/null @@ -1,4 +0,0 @@ -xA -0@Q9LiDz`R"~kkK*yLA-E -̎#1l+yd]_@A -Ysv#"D&ca:Nw=2>:5G=Md~9 \ No newline at end of file diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/c6/ffcbed8902934d462722ff6ef471813b9a4df5 b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/c6/ffcbed8902934d462722ff6ef471813b9a4df5 deleted file mode 100644 index 714f1dd9d..000000000 Binary files a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/c6/ffcbed8902934d462722ff6ef471813b9a4df5 and /dev/null differ diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/refs/heads/master b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index af1728373..000000000 --- a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -30ef3df33d31f0b98298881be4dbe69c54758ba2 diff --git a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/refs/remotes/origin/master deleted file mode 100644 index af1728373..000000000 --- a/test/integration/setUpstreamThroughPush/expected/repo/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -30ef3df33d31f0b98298881be4dbe69c54758ba2 diff --git a/test/integration/setUpstreamThroughPush/expected/repo/myfile1 b/test/integration/setUpstreamThroughPush/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/setUpstreamThroughPush/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/setUpstreamThroughPush/expected/repo/myfile2 b/test/integration/setUpstreamThroughPush/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/setUpstreamThroughPush/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/setUpstreamThroughPush/expected/repo/myfile3 b/test/integration/setUpstreamThroughPush/expected/repo/myfile3 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/setUpstreamThroughPush/expected/repo/myfile3 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/setUpstreamThroughPush/expected/repo/myfile4 b/test/integration/setUpstreamThroughPush/expected/repo/myfile4 deleted file mode 100644 index d234c5e05..000000000 --- a/test/integration/setUpstreamThroughPush/expected/repo/myfile4 +++ /dev/null @@ -1 +0,0 @@ -test4 diff --git a/test/integration/setUpstreamThroughPush/recording.json b/test/integration/setUpstreamThroughPush/recording.json deleted file mode 100644 index 8776559d9..000000000 --- a/test/integration/setUpstreamThroughPush/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":808,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1221,"Mod":0,"Key":256,"Ch":93},{"Timestamp":1598,"Mod":0,"Key":256,"Ch":110},{"Timestamp":2267,"Mod":0,"Key":256,"Ch":111},{"Timestamp":2399,"Mod":0,"Key":256,"Ch":114},{"Timestamp":2500,"Mod":0,"Key":256,"Ch":105},{"Timestamp":2573,"Mod":0,"Key":256,"Ch":103},{"Timestamp":2634,"Mod":0,"Key":256,"Ch":105},{"Timestamp":2710,"Mod":0,"Key":256,"Ch":110},{"Timestamp":3042,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3671,"Mod":0,"Key":256,"Ch":46},{"Timestamp":4001,"Mod":0,"Key":256,"Ch":46},{"Timestamp":4215,"Mod":0,"Key":256,"Ch":47},{"Timestamp":4511,"Mod":0,"Key":256,"Ch":111},{"Timestamp":4896,"Mod":0,"Key":256,"Ch":114},{"Timestamp":5008,"Mod":0,"Key":256,"Ch":105},{"Timestamp":5133,"Mod":0,"Key":256,"Ch":103},{"Timestamp":5202,"Mod":0,"Key":256,"Ch":105},{"Timestamp":5255,"Mod":0,"Key":256,"Ch":110},{"Timestamp":5558,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6247,"Mod":0,"Key":256,"Ch":102},{"Timestamp":7072,"Mod":0,"Key":256,"Ch":91},{"Timestamp":7716,"Mod":0,"Key":256,"Ch":112},{"Timestamp":8319,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9159,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":254,"Height":74}]} \ No newline at end of file diff --git a/test/integration/setUpstreamThroughPush/setup.sh b/test/integration/setUpstreamThroughPush/setup.sh deleted file mode 100644 index d0bc91327..000000000 --- a/test/integration/setUpstreamThroughPush/setup.sh +++ /dev/null @@ -1,32 +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 diff --git a/test/integration/setUpstreamThroughPush/test.json b/test/integration/setUpstreamThroughPush/test.json deleted file mode 100644 index 11fdee3ab..000000000 --- a/test/integration/setUpstreamThroughPush/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "allow setting the upstream of the current branch when pushing", "speed": 10 } diff --git a/test/integration/unsetUpstream/expected/origin/HEAD b/test/integration/unsetUpstream/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/unsetUpstream/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/unsetUpstream/expected/origin/config b/test/integration/unsetUpstream/expected/origin/config deleted file mode 100644 index 56c5e2484..000000000 --- a/test/integration/unsetUpstream/expected/origin/config +++ /dev/null @@ -1,6 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true -[remote "origin"] - url = /home/mark/Downloads/gits/lazygit/test/integration/unsetUpstream/actual/./repo diff --git a/test/integration/unsetUpstream/expected/origin/description b/test/integration/unsetUpstream/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/unsetUpstream/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/unsetUpstream/expected/origin/info/exclude b/test/integration/unsetUpstream/expected/origin/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/test/integration/unsetUpstream/expected/origin/info/exclude +++ /dev/null @@ -1,6 +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] -# *~ diff --git a/test/integration/unsetUpstream/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/unsetUpstream/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/unsetUpstream/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/unsetUpstream/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/unsetUpstream/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/unsetUpstream/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/unsetUpstream/expected/origin/objects/24/351b001b63ca15b6b83542ffb765567e17df23 b/test/integration/unsetUpstream/expected/origin/objects/24/351b001b63ca15b6b83542ffb765567e17df23 deleted file mode 100644 index 5167b74e4..000000000 Binary files a/test/integration/unsetUpstream/expected/origin/objects/24/351b001b63ca15b6b83542ffb765567e17df23 and /dev/null differ diff --git a/test/integration/unsetUpstream/expected/origin/objects/28/9b2354ac3770d96fc3fcfd2a8026fc78a32cc5 b/test/integration/unsetUpstream/expected/origin/objects/28/9b2354ac3770d96fc3fcfd2a8026fc78a32cc5 deleted file mode 100644 index 8283ae159..000000000 --- a/test/integration/unsetUpstream/expected/origin/objects/28/9b2354ac3770d96fc3fcfd2a8026fc78a32cc5 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0@Q9I -"BW=FL!R"~r*Jd ¬DjE 1650269774 +0200 commit (initial): myfile1 -289b2354ac3770d96fc3fcfd2a8026fc78a32cc5 7010e33e20178a1a179853948691a9036d48e562 CI 1650269774 +0200 commit: myfile2 -7010e33e20178a1a179853948691a9036d48e562 994a4733eacc0000721e01a177704e2f26216510 CI 1650269774 +0200 commit: myfile3 -994a4733eacc0000721e01a177704e2f26216510 24351b001b63ca15b6b83542ffb765567e17df23 CI 1650269774 +0200 commit: myfile4 -24351b001b63ca15b6b83542ffb765567e17df23 7010e33e20178a1a179853948691a9036d48e562 CI 1650269774 +0200 reset: moving to HEAD~2 diff --git a/test/integration/unsetUpstream/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/unsetUpstream/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 1bc609ea6..000000000 --- a/test/integration/unsetUpstream/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 289b2354ac3770d96fc3fcfd2a8026fc78a32cc5 CI 1650269774 +0200 commit (initial): myfile1 -289b2354ac3770d96fc3fcfd2a8026fc78a32cc5 7010e33e20178a1a179853948691a9036d48e562 CI 1650269774 +0200 commit: myfile2 -7010e33e20178a1a179853948691a9036d48e562 994a4733eacc0000721e01a177704e2f26216510 CI 1650269774 +0200 commit: myfile3 -994a4733eacc0000721e01a177704e2f26216510 24351b001b63ca15b6b83542ffb765567e17df23 CI 1650269774 +0200 commit: myfile4 -24351b001b63ca15b6b83542ffb765567e17df23 7010e33e20178a1a179853948691a9036d48e562 CI 1650269774 +0200 reset: moving to HEAD~2 diff --git a/test/integration/unsetUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/unsetUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index cbf8607af..000000000 --- a/test/integration/unsetUpstream/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 24351b001b63ca15b6b83542ffb765567e17df23 CI 1650269774 +0200 fetch origin: storing head diff --git a/test/integration/unsetUpstream/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/unsetUpstream/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/unsetUpstream/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/unsetUpstream/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/unsetUpstream/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/unsetUpstream/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/unsetUpstream/expected/repo/.git_keep/objects/24/351b001b63ca15b6b83542ffb765567e17df23 b/test/integration/unsetUpstream/expected/repo/.git_keep/objects/24/351b001b63ca15b6b83542ffb765567e17df23 deleted file mode 100644 index 5167b74e4..000000000 Binary files a/test/integration/unsetUpstream/expected/repo/.git_keep/objects/24/351b001b63ca15b6b83542ffb765567e17df23 and /dev/null differ diff --git a/test/integration/unsetUpstream/expected/repo/.git_keep/objects/28/9b2354ac3770d96fc3fcfd2a8026fc78a32cc5 b/test/integration/unsetUpstream/expected/repo/.git_keep/objects/28/9b2354ac3770d96fc3fcfd2a8026fc78a32cc5 deleted file mode 100644 index 8283ae159..000000000 --- a/test/integration/unsetUpstream/expected/repo/.git_keep/objects/28/9b2354ac3770d96fc3fcfd2a8026fc78a32cc5 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0@Q9I -"BW=FL!R"~r*Jd ¬DjE 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 -git remote add origin ../origin -git fetch origin -git branch --set-upstream-to=origin/master - diff --git a/test/integration/unsetUpstream/test.json b/test/integration/unsetUpstream/test.json deleted file mode 100644 index dffe129cd..000000000 --- a/test/integration/unsetUpstream/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "allow unsetting the upstream of the current branch", "speed": 10 }