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/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/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/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/tests_gen.go b/pkg/integration/tests/tests_gen.go index a7cade4d4..635451b54 100644 --- a/pkg/integration/tests/tests_gen.go +++ b/pkg/integration/tests/tests_gen.go @@ -18,6 +18,7 @@ import ( "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" @@ -38,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, @@ -46,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, @@ -92,6 +98,7 @@ var tests = []*components.IntegrationTest{ reflog.CherryPick, reflog.Patch, reflog.Reset, + staging.Search, stash.Apply, stash.ApplyPatch, stash.CreateBranch, 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 }