From 010f6d7f6ebc115401fa66c490b7227c5a9a7e53 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 12 Feb 2023 09:53:57 +1100 Subject: [PATCH] migrate submodule add test --- pkg/integration/components/prompt_driver.go | 5 +- pkg/integration/components/viewDriver.go | 63 ++++++++++++----- pkg/integration/tests/submodule/add.go | 65 ++++++++++++++++++ pkg/integration/tests/tests.go | 2 + .../submoduleAdd/expected/other_repo/HEAD | 1 - .../submoduleAdd/expected/other_repo/config | 8 --- .../expected/other_repo/description | 1 - .../expected/other_repo/info/exclude | 7 -- .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../42/530e986dbb65877ed8d61ca0c816e425e5c62e | Bin 150 -> 0 bytes .../a5/0a5125768001a3ea263ffb7cafbc421a508153 | 2 - .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../expected/other_repo/packed-refs | 2 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/FETCH_HEAD | 0 .../submoduleAdd/expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/config | 13 ---- .../expected/repo/.git_keep/description | 1 - .../expected/repo/.git_keep/index | Bin 361 -> 0 bytes .../expected/repo/.git_keep/info/exclude | 7 -- .../expected/repo/.git_keep/logs/HEAD | 3 - .../repo/.git_keep/logs/refs/heads/master | 3 - .../expected/repo/.git_keep/modules/blah/HEAD | 1 - .../repo/.git_keep/modules/blah/config | 14 ---- .../repo/.git_keep/modules/blah/description | 1 - .../repo/.git_keep/modules/blah/index | Bin 209 -> 0 bytes .../repo/.git_keep/modules/blah/info/exclude | 7 -- .../repo/.git_keep/modules/blah/logs/HEAD | 1 - .../modules/blah/logs/refs/heads/master | 1 - .../blah/logs/refs/remotes/origin/HEAD | 1 - .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../42/530e986dbb65877ed8d61ca0c816e425e5c62e | Bin 150 -> 0 bytes .../a5/0a5125768001a3ea263ffb7cafbc421a508153 | 2 - .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../repo/.git_keep/modules/blah/packed-refs | 2 - .../.git_keep/modules/blah/refs/heads/master | 1 - .../modules/blah/refs/remotes/origin/HEAD | 1 - .../0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 | Bin 52 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../42/530e986dbb65877ed8d61ca0c816e425e5c62e | Bin 150 -> 0 bytes .../5f/77fb3622a1035782a7dacc0cca12e674066b9e | Bin 144 -> 0 bytes .../a5/0a5125768001a3ea263ffb7cafbc421a508153 | 2 - .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/341a59f0ddeef969e69fb6368266d22b0f2416 | Bin 77 -> 0 bytes .../b9/7660affc790464b00ad45c7186a882238d77fb | Bin 67 -> 0 bytes .../dc/5bde4a09968b0819f34d193f6780df295d71cf | Bin 146 -> 0 bytes .../expected/repo/.git_keep/refs/heads/master | 1 - .../expected/repo/.gitmodules_keep | 3 - .../submoduleAdd/expected/repo/haha/.git_keep | 1 - .../submoduleAdd/expected/repo/haha/myfile1 | 1 - .../submoduleAdd/expected/repo/haha/myfile2 | 1 - .../submoduleAdd/expected/repo/myfile1 | 1 - .../submoduleAdd/expected/repo/myfile2 | 1 - test/integration/submoduleAdd/recording.json | 1 - test/integration/submoduleAdd/setup.sh | 29 -------- test/integration/submoduleAdd/test.json | 4 -- 60 files changed, 115 insertions(+), 147 deletions(-) create mode 100644 pkg/integration/tests/submodule/add.go delete mode 100644 test/integration/submoduleAdd/expected/other_repo/HEAD delete mode 100644 test/integration/submoduleAdd/expected/other_repo/config delete mode 100644 test/integration/submoduleAdd/expected/other_repo/description delete mode 100644 test/integration/submoduleAdd/expected/other_repo/info/exclude delete mode 100644 test/integration/submoduleAdd/expected/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/submoduleAdd/expected/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/submoduleAdd/expected/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e delete mode 100644 test/integration/submoduleAdd/expected/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 delete mode 100644 test/integration/submoduleAdd/expected/other_repo/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/submoduleAdd/expected/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/submoduleAdd/expected/other_repo/packed-refs delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/FETCH_HEAD delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/config delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/description delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/index delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/info/exclude delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/HEAD delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/config delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/description delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/index delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/info/exclude delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/logs/HEAD delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/logs/refs/heads/master delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/logs/refs/remotes/origin/HEAD delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/packed-refs delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/refs/heads/master delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/refs/remotes/origin/HEAD delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/objects/5f/77fb3622a1035782a7dacc0cca12e674066b9e delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/objects/b9/7660affc790464b00ad45c7186a882238d77fb delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/objects/dc/5bde4a09968b0819f34d193f6780df295d71cf delete mode 100644 test/integration/submoduleAdd/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/submoduleAdd/expected/repo/.gitmodules_keep delete mode 100644 test/integration/submoduleAdd/expected/repo/haha/.git_keep delete mode 100644 test/integration/submoduleAdd/expected/repo/haha/myfile1 delete mode 100644 test/integration/submoduleAdd/expected/repo/haha/myfile2 delete mode 100644 test/integration/submoduleAdd/expected/repo/myfile1 delete mode 100644 test/integration/submoduleAdd/expected/repo/myfile2 delete mode 100644 test/integration/submoduleAdd/recording.json delete mode 100644 test/integration/submoduleAdd/setup.sh delete mode 100644 test/integration/submoduleAdd/test.json diff --git a/pkg/integration/components/prompt_driver.go b/pkg/integration/components/prompt_driver.go index 83037a90d..45a6db513 100644 --- a/pkg/integration/components/prompt_driver.go +++ b/pkg/integration/components/prompt_driver.go @@ -32,7 +32,10 @@ func (self *PromptDriver) Type(value string) *PromptDriver { } func (self *PromptDriver) Clear() *PromptDriver { - panic("Clear method not yet implemented!") + // TODO: soft-code this + self.t.press("") + + return self } func (self *PromptDriver) Confirm() { diff --git a/pkg/integration/components/viewDriver.go b/pkg/integration/components/viewDriver.go index 238e04f55..04c58fc81 100644 --- a/pkg/integration/components/viewDriver.go +++ b/pkg/integration/components/viewDriver.go @@ -5,6 +5,7 @@ import ( "strings" "github.com/jesseduffield/gocui" + "github.com/samber/lo" ) type ViewDriver struct { @@ -104,32 +105,56 @@ func (self *ViewDriver) SelectedLineIdx(expected int) *ViewDriver { return self } -// focus the view (assumes the view is a side-view that can be focused via a keybinding) +// focus the view (assumes the view is a side-view) func (self *ViewDriver) Focus() *ViewDriver { - // we can easily change focus by switching to the view's window, but this assumes that the desired view - // is at the top of that window. So for now we'll switch to the window then assert that the desired - // view is on top (i.e. that it's the current view). - // If we want to support other views e.g. the tags view, we'll need to add more logic here. viewName := self.getView().Name() - // using a map rather than a slice because we might add other views which share a window index later - windowIndexMap := map[string]int{ - "status": 0, - "files": 1, - "localBranches": 2, - "commits": 3, - "stash": 4, + type window struct { + name string + viewNames []string + } + windows := []window{ + {name: "status", viewNames: []string{"status"}}, + {name: "files", viewNames: []string{"files", "submodules"}}, + {name: "branches", viewNames: []string{"localBranches", "remotes", "tags"}}, + {name: "commits", viewNames: []string{"commits", "reflogCommits"}}, + {name: "stash", viewNames: []string{"stash"}}, } - index, ok := windowIndexMap[viewName] - if !ok { - self.t.fail(fmt.Sprintf("Cannot focus view %s: Focus() method not implemented", viewName)) + for windowIndex, window := range windows { + if lo.Contains(window.viewNames, viewName) { + tabIndex := lo.IndexOf(window.viewNames, viewName) + // jump to the desired window + self.t.press(self.t.keys.Universal.JumpToBlock[windowIndex]) + + // assert we're in the window before continuing + self.t.assertWithRetries(func() (bool, string) { + currentWindowName := self.t.gui.CurrentContext().GetWindowName() + // by convention the window is named after the first view in the window + return currentWindowName == window.name, fmt.Sprintf("Expected to be in window '%s', but was in '%s'", window.name, currentWindowName) + }) + + // switch to the desired tab + currentViewName := self.t.gui.CurrentContext().GetViewName() + currentViewTabIndex := lo.IndexOf(window.viewNames, currentViewName) + if tabIndex > currentViewTabIndex { + for i := 0; i < tabIndex-currentViewTabIndex; i++ { + self.t.press(self.t.keys.Universal.NextTab) + } + } else if tabIndex < currentViewTabIndex { + for i := 0; i < currentViewTabIndex-tabIndex; i++ { + self.t.press(self.t.keys.Universal.PrevTab) + } + } + + // assert that we're now in the expected view + self.IsFocused() + + return self + } } - self.t.press(self.t.keys.Universal.JumpToBlock[index]) - - // assert that we land in the expected view - self.IsFocused() + self.t.fail(fmt.Sprintf("Cannot focus view %s: Focus() method not implemented", viewName)) return self } diff --git a/pkg/integration/tests/submodule/add.go b/pkg/integration/tests/submodule/add.go new file mode 100644 index 000000000..e04141499 --- /dev/null +++ b/pkg/integration/tests/submodule/add.go @@ -0,0 +1,65 @@ +package submodule + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var Add = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Add a submodule", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("first commit") + shell.RunCommand("git clone --bare . ../other_repo") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Submodules().Focus(). + Press(keys.Universal.New). + Tap(func() { + t.ExpectPopup().Prompt(). + Title(Equals("new submodule URL:")). + Type("../other_repo").Confirm() + + t.ExpectPopup().Prompt(). + Title(Equals("new submodule name:")). + InitialText(Equals("other_repo")). + Clear().Type("my_submodule").Confirm() + + t.ExpectPopup().Prompt(). + Title(Equals("new submodule path:")). + InitialText(Equals("my_submodule")). + Clear().Type("my_submodule_path").Confirm() + }). + Lines( + Contains("my_submodule").IsSelected(), + ) + + t.Views().Main().TopLines( + Contains("Name: my_submodule"), + Contains("Path: my_submodule_path"), + Contains("Url: ../other_repo"), + ) + + t.Views().Files().Focus(). + Lines( + Contains(".gitmodules").IsSelected(), + Contains("my_submodule_path (submodule)"), + ). + Tap(func() { + t.Views().Main().Content( + Contains("[submodule \"my_submodule\"]"). + Contains("path = my_submodule_path"). + Contains("url = ../other_repo"), + ) + }). + SelectNextItem(). + Tap(func() { + t.Views().Main().Content( + Contains("Submodule my_submodule_path"). + Contains("(new submodule)"), + ) + }) + }, +}) diff --git a/pkg/integration/tests/tests.go b/pkg/integration/tests/tests.go index af3ef4050..d04bb7869 100644 --- a/pkg/integration/tests/tests.go +++ b/pkg/integration/tests/tests.go @@ -23,6 +23,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/stash" + "github.com/jesseduffield/lazygit/pkg/integration/tests/submodule" "github.com/jesseduffield/lazygit/pkg/integration/tests/sync" ) @@ -75,6 +76,7 @@ var tests = []*components.IntegrationTest{ filter_by_path.SelectFile, filter_by_path.TypeFile, patch_building.BuildPatchAndCopyToClipboard, + submodule.Add, } func GetTests() []*components.IntegrationTest { diff --git a/test/integration/submoduleAdd/expected/other_repo/HEAD b/test/integration/submoduleAdd/expected/other_repo/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/submoduleAdd/expected/other_repo/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/submoduleAdd/expected/other_repo/config b/test/integration/submoduleAdd/expected/other_repo/config deleted file mode 100644 index e5abd1a6d..000000000 --- a/test/integration/submoduleAdd/expected/other_repo/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/submoduleAdd/actual/./repo diff --git a/test/integration/submoduleAdd/expected/other_repo/description b/test/integration/submoduleAdd/expected/other_repo/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/submoduleAdd/expected/other_repo/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/submoduleAdd/expected/other_repo/info/exclude b/test/integration/submoduleAdd/expected/other_repo/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/submoduleAdd/expected/other_repo/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/submoduleAdd/expected/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/submoduleAdd/expected/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmb~ZE#08nZNMgRZ+ diff --git a/test/integration/submoduleAdd/expected/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e b/test/integration/submoduleAdd/expected/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e deleted file mode 100644 index 64d20cb1ea175608a3e05acff298a97ed57eb7b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmV;H0BQet0gaA93c@fDMP26<*$Xn6B$Eb2gsyswNjrlDV@rvkw>L*{``_d7=dISY zS(n499U_*K4~}D2SQZh@l!dYu@-!gPf>=N?I5ImQ@@keNaC8_G4FHb4Fp^g-X=W{R zz}|wvMQ`}s9@}BZ$zI3lE+4M@Q!evXZ?@x*GNzdA861G=Yd_WGPu`~^A08nuUMF0Q* diff --git a/test/integration/submoduleAdd/expected/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/submoduleAdd/expected/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6af75cdd27ac5d9628a27faecc40fb66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg diff --git a/test/integration/submoduleAdd/expected/other_repo/packed-refs b/test/integration/submoduleAdd/expected/other_repo/packed-refs deleted file mode 100644 index 62f6568b2..000000000 --- a/test/integration/submoduleAdd/expected/other_repo/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -42530e986dbb65877ed8d61ca0c816e425e5c62e refs/heads/master diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/submoduleAdd/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/submoduleAdd/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/FETCH_HEAD b/test/integration/submoduleAdd/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/HEAD b/test/integration/submoduleAdd/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/submoduleAdd/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/config b/test/integration/submoduleAdd/expected/repo/.git_keep/config deleted file mode 100644 index 22f6527ea..000000000 --- a/test/integration/submoduleAdd/expected/repo/.git_keep/config +++ /dev/null @@ -1,13 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[submodule "blah"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleAdd/actual/other_repo - active = true diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/description b/test/integration/submoduleAdd/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/submoduleAdd/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/submoduleAdd/expected/repo/.git_keep/index b/test/integration/submoduleAdd/expected/repo/.git_keep/index deleted file mode 100644 index 4690b27b142d6aca4910bd85b96f2d8b2ee21fc5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 361 zcmZ?q402{*U|<4bmL&Vr2MtQO7l7%aFTIQm46ICZKl(5*G%jIaVEhVHBLc*xJIfN* z|EXk2*}!!rrm$^AlX7qQZw79?^vsgn{FKt1)MB6_5CEB@Z`G^|qoL+8GcY^=%EHZC z;1tX^BX@Udd)zC?sZ@#H&Q2=Hp@zRJL!TbY)blWGVxM 1534792759 +0100 commit (initial): myfile1 -a50a5125768001a3ea263ffb7cafbc421a508153 42530e986dbb65877ed8d61ca0c816e425e5c62e CI 1534792759 +0100 commit: myfile2 -42530e986dbb65877ed8d61ca0c816e425e5c62e dc5bde4a09968b0819f34d193f6780df295d71cf CI 1648348101 +1100 commit: test diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/submoduleAdd/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 58db0ace2..000000000 --- a/test/integration/submoduleAdd/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 a50a5125768001a3ea263ffb7cafbc421a508153 CI 1534792759 +0100 commit (initial): myfile1 -a50a5125768001a3ea263ffb7cafbc421a508153 42530e986dbb65877ed8d61ca0c816e425e5c62e CI 1534792759 +0100 commit: myfile2 -42530e986dbb65877ed8d61ca0c816e425e5c62e dc5bde4a09968b0819f34d193f6780df295d71cf CI 1648348101 +1100 commit: test diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/HEAD b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/config b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/config deleted file mode 100644 index 39065f535..000000000 --- a/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/config +++ /dev/null @@ -1,14 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true - worktree = ../../../haha -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleAdd/actual/other_repo - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/description b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/index b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/index deleted file mode 100644 index 27523e56e3e7753bb1e731cd0fb670175330790e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmZ?q402{*U|<5_B>U3`^(`K-!e~YY23DrIAKe)k8kaCIFn$H95dmVhrF$O#RZYF| zB_cG6C*SEpfLBZRRR;Fl%CyX!R70Qwuzp*;`!E`6jt9Cq5+cvXMP zEA9Cf>M(PRfaZh*xw--=Nd_YY1Fq#JQjs6-zWbT^Z2mU0rnF1i{3>Gqw{2*6eDl4R Q)TQQRcbSeN{w}fG0P8JB$^ZZW diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/info/exclude b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/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/submoduleAdd/expected/repo/.git_keep/modules/blah/logs/HEAD b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/logs/HEAD deleted file mode 100644 index 502ae05d9..000000000 --- a/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/logs/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield 1648348097 +1100 clone: from /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleAdd/actual/other_repo diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/logs/refs/heads/master b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/logs/refs/heads/master deleted file mode 100644 index 502ae05d9..000000000 --- a/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield 1648348097 +1100 clone: from /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleAdd/actual/other_repo diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/logs/refs/remotes/origin/HEAD b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/logs/refs/remotes/origin/HEAD deleted file mode 100644 index 502ae05d9..000000000 --- a/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/logs/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield 1648348097 +1100 clone: from /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleAdd/actual/other_repo diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmb~ZE#08nZNMgRZ+ diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e deleted file mode 100644 index 64d20cb1ea175608a3e05acff298a97ed57eb7b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmV;H0BQet0gaA93c@fDMP26<*$Xn6B$Eb2gsyswNjrlDV@rvkw>L*{``_d7=dISY zS(n499U_*K4~}D2SQZh@l!dYu@-!gPf>=N?I5ImQ@@keNaC8_G4FHb4Fp^g-X=W{R zz}|wvMQ`}s9@}BZ$zI3lE+4M@Q!evXZ?@x*GNzdA861G=Yd_WGPu`~^A08nuUMF0Q* diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6af75cdd27ac5d9628a27faecc40fb66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/packed-refs b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/packed-refs deleted file mode 100644 index 2991aad64..000000000 --- a/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -42530e986dbb65877ed8d61ca0c816e425e5c62e refs/remotes/origin/master diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/refs/heads/master b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/refs/heads/master deleted file mode 100644 index a70ff80c0..000000000 --- a/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -42530e986dbb65877ed8d61ca0c816e425e5c62e diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/refs/remotes/origin/HEAD b/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/refs/remotes/origin/HEAD deleted file mode 100644 index 6efe28fff..000000000 --- a/test/integration/submoduleAdd/expected/repo/.git_keep/modules/blah/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/remotes/origin/master diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/submoduleAdd/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4eeb6ad6875bcc2a2b91ca3345ee06b45e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmb~ZE#08nZNMgRZ+ diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e b/test/integration/submoduleAdd/expected/repo/.git_keep/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e deleted file mode 100644 index 64d20cb1ea175608a3e05acff298a97ed57eb7b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmV;H0BQet0gaA93c@fDMP26<*$Xn6B$Eb2gsyswNjrlDV@rvkw>L*{``_d7=dISY zS(n499U_*K4~}D2SQZh@l!dYu@-!gPf>=N?I5ImQ@@keNaC8_G4FHb4Fp^g-X=W{R zz}|wvMQ`}s9@}BZ$zI3lE+4M@Q!evXZ?@x*GNzdA861G=Yd_WGPu7F=Q|_FfcPQQP4}zEXmDJDa}bOX4qMlu>MaaOUeeWD=~#_ zE1Hyh%YPf1832JoMq)-HgHtfyjNIL+?R7V<$t*Y__C)pRF+Hd;xs_>|IjM#WOZPnf ytD1V_OGIcCPrlQI0I!zrt0+p07$kUp7&R#EJNI(cqVTHzmRH*IEz|+MIXjmQ#zA-h diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 b/test/integration/submoduleAdd/expected/repo/.git_keep/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 deleted file mode 100644 index 5dd5f3236..000000000 --- a/test/integration/submoduleAdd/expected/repo/.git_keep/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 +++ /dev/null @@ -1,2 +0,0 @@ -xM -0@sJ&N  I޾/ZHR%d"r@X<-4dG5?fxN(_& 6]פ˟\ճ5, \ No newline at end of file diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/submoduleAdd/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5fbab12262e28d85e78af8a31cd0024c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb`~^A08nuUMF0Q* diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/submoduleAdd/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6af75cdd27ac5d9628a27faecc40fb66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77 zcmV-T0J8sh0V^p=O;s>AU@$Z=Ff%bx$gNDv%tB=N-?^8o7KK;!x4hDxZ=ntVWIZ01*pecg diff --git a/test/integration/submoduleAdd/expected/repo/.git_keep/objects/b9/7660affc790464b00ad45c7186a882238d77fb b/test/integration/submoduleAdd/expected/repo/.git_keep/objects/b9/7660affc790464b00ad45c7186a882238d77fb deleted file mode 100644 index c4d570c9dfb86a4f2c3724727b92592c87badd56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 67 zcmV-J0KETr0ZYosPf{>7W{55>P0GzrDa}b$P)f>4%utHu;w(rk$xyIW$VkjcwB|}E43d%b z&>DrD8vgYAy4z{C<22v&%WZq=Mb>t;NFn=>5zw9y0n9; myfile1 -git add . -git commit -am "myfile1" -echo test2 > myfile2 -git add . -git commit -am "myfile2" - -cd .. -git clone --bare ./repo other_repo -cd repo diff --git a/test/integration/submoduleAdd/test.json b/test/integration/submoduleAdd/test.json deleted file mode 100644 index d937c5747..000000000 --- a/test/integration/submoduleAdd/test.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "description": "Add submodule", - "speed": 5 -}