diff --git a/pkg/integration/components/matcher.go b/pkg/integration/components/matcher.go index 0bbb1109b..85a26bbde 100644 --- a/pkg/integration/components/matcher.go +++ b/pkg/integration/components/matcher.go @@ -83,7 +83,7 @@ func (self *matcher) MatchesRegexp(target string) *matcher { if err != nil { return false, fmt.Sprintf("Unexpected error parsing regular expression '%s': %s", target, err.Error()) } - return matched, fmt.Sprintf("Expected '%s' to match regular expression '%s'", value, target) + return matched, fmt.Sprintf("Expected '%s' to match regular expression /%s/", value, target) }, }) } diff --git a/pkg/integration/tests/submodule/enter.go b/pkg/integration/tests/submodule/enter.go new file mode 100644 index 000000000..c97e55a46 --- /dev/null +++ b/pkg/integration/tests/submodule/enter.go @@ -0,0 +1,69 @@ +package submodule + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var Enter = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Enter a submodule, add a commit, and then stage the change in the parent repo", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(cfg *config.AppConfig) { + cfg.UserConfig.CustomCommands = []config.CustomCommand{ + { + Key: "e", + Context: "files", + Command: "git commit --allow-empty -m \"empty commit\"", + }, + } + }, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("first commit") + shell.RunCommand("git clone --bare . ../other_repo") + shell.RunCommand("git submodule add ../other_repo my_submodule") + shell.GitAddAll() + shell.Commit("add submodule") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Submodules().Focus(). + Lines( + Contains("my_submodule").IsSelected(), + ). + // enter the submodule + PressEnter() + + t.Views().Files().IsFocused(). + Press("e"). + Tap(func() { + t.Views().Commits().Content(Contains("empty commit")) + }). + // return to the parent repo + PressEscape() + + t.Views().Submodules().IsFocused() + + // we see the new commit in the submodule is ready to be staged in the parent repo + t.Views().Main().Content(Contains("> empty commit")) + + t.Views().Files().Focus(). + Lines( + MatchesRegexp(` M.*my_submodule \(submodule\)`).IsSelected(), + ). + Tap(func() { + // main view also shows the new commit when we're looking at the submodule within the files view + t.Views().Main().Content(Contains("> empty commit")) + }). + PressPrimaryAction(). + Press(keys.Files.CommitChanges). + Tap(func() { + t.ExpectPopup().CommitMessagePanel().Type("submodule change").Confirm() + }). + IsEmpty() + + t.Views().Submodules().Focus() + + // we no longer report a new commit because we've committed it in the parent repo + t.Views().Main().Content(DoesNotContain("> empty commit")) + }, +}) diff --git a/pkg/integration/tests/tests.go b/pkg/integration/tests/tests.go index 79bb5a84c..b7e74114c 100644 --- a/pkg/integration/tests/tests.go +++ b/pkg/integration/tests/tests.go @@ -78,6 +78,7 @@ var tests = []*components.IntegrationTest{ patch_building.BuildPatchAndCopyToClipboard, submodule.Add, submodule.Remove, + submodule.Enter, } func GetTests() []*components.IntegrationTest { diff --git a/test/integration/submoduleEnter/expected/other_repo/HEAD b/test/integration/submoduleEnter/expected/other_repo/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/submoduleEnter/expected/other_repo/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/submoduleEnter/expected/other_repo/config b/test/integration/submoduleEnter/expected/other_repo/config deleted file mode 100644 index f3148fc2f..000000000 --- a/test/integration/submoduleEnter/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/submoduleEnter/actual/./repo diff --git a/test/integration/submoduleEnter/expected/other_repo/description b/test/integration/submoduleEnter/expected/other_repo/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/submoduleEnter/expected/other_repo/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/submoduleEnter/expected/other_repo/info/exclude b/test/integration/submoduleEnter/expected/other_repo/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/submoduleEnter/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/submoduleEnter/expected/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/submoduleEnter/expected/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/submoduleEnter/expected/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/submoduleEnter/expected/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/submoduleEnter/expected/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/submoduleEnter/expected/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/submoduleEnter/expected/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e b/test/integration/submoduleEnter/expected/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e deleted file mode 100644 index 64d20cb1e..000000000 Binary files a/test/integration/submoduleEnter/expected/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e and /dev/null differ diff --git a/test/integration/submoduleEnter/expected/other_repo/objects/96/c588f28aac5a8ebd6430526697e82e46b3180c b/test/integration/submoduleEnter/expected/other_repo/objects/96/c588f28aac5a8ebd6430526697e82e46b3180c deleted file mode 100644 index 56590efa1..000000000 Binary files a/test/integration/submoduleEnter/expected/other_repo/objects/96/c588f28aac5a8ebd6430526697e82e46b3180c and /dev/null differ diff --git a/test/integration/submoduleEnter/expected/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 b/test/integration/submoduleEnter/expected/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 deleted file mode 100644 index 5dd5f3236..000000000 --- a/test/integration/submoduleEnter/expected/other_repo/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/submoduleEnter/expected/other_repo/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/submoduleEnter/expected/other_repo/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/submoduleEnter/expected/other_repo/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/submoduleEnter/expected/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/submoduleEnter/expected/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/submoduleEnter/expected/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/submoduleEnter/expected/other_repo/objects/fc/4712e93d74ad4fb68e2fd219ac253ae03e19a4 b/test/integration/submoduleEnter/expected/other_repo/objects/fc/4712e93d74ad4fb68e2fd219ac253ae03e19a4 deleted file mode 100644 index 95d1a3bc9..000000000 --- a/test/integration/submoduleEnter/expected/other_repo/objects/fc/4712e93d74ad4fb68e2fd219ac253ae03e19a4 +++ /dev/null @@ -1,2 +0,0 @@ -xK -0@] L&PDH&S,4z{{㭵k¥":!(gLR*o!($` =:8Fa-bJ-gdQN-Dwn'=C>xkwm\NzNu3W;/x9 \ No newline at end of file diff --git a/test/integration/submoduleEnter/expected/other_repo/packed-refs b/test/integration/submoduleEnter/expected/other_repo/packed-refs deleted file mode 100644 index 83e031563..000000000 --- a/test/integration/submoduleEnter/expected/other_repo/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -fc4712e93d74ad4fb68e2fd219ac253ae03e19a4 refs/heads/master diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/submoduleEnter/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/submoduleEnter/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/FETCH_HEAD b/test/integration/submoduleEnter/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/HEAD b/test/integration/submoduleEnter/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/submoduleEnter/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/config b/test/integration/submoduleEnter/expected/repo/.git_keep/config deleted file mode 100644 index 053d8f942..000000000 --- a/test/integration/submoduleEnter/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 "other_repo"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleEnter/actual/other_repo - active = true diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/description b/test/integration/submoduleEnter/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/submoduleEnter/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/submoduleEnter/expected/repo/.git_keep/index b/test/integration/submoduleEnter/expected/repo/.git_keep/index deleted file mode 100644 index 0b75986af..000000000 Binary files a/test/integration/submoduleEnter/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/info/exclude b/test/integration/submoduleEnter/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/submoduleEnter/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/submoduleEnter/expected/repo/.git_keep/logs/HEAD b/test/integration/submoduleEnter/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index bcb2bf2e8..000000000 --- a/test/integration/submoduleEnter/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 a50a5125768001a3ea263ffb7cafbc421a508153 CI 1534792759 +0100 commit (initial): myfile1 -a50a5125768001a3ea263ffb7cafbc421a508153 42530e986dbb65877ed8d61ca0c816e425e5c62e CI 1534792759 +0100 commit: myfile2 -42530e986dbb65877ed8d61ca0c816e425e5c62e fc4712e93d74ad4fb68e2fd219ac253ae03e19a4 CI 1534792759 +0100 commit: myfile3 -fc4712e93d74ad4fb68e2fd219ac253ae03e19a4 e1eb418c0ff98940d4ea817eebcff5dcdde645ce CI 1534792759 +0100 commit: add submodule -e1eb418c0ff98940d4ea817eebcff5dcdde645ce fd65a5c96edfc884a78bfe3d0240cb8a7ea0a31a CI 1648348036 +1100 commit: test diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/submoduleEnter/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index bcb2bf2e8..000000000 --- a/test/integration/submoduleEnter/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 a50a5125768001a3ea263ffb7cafbc421a508153 CI 1534792759 +0100 commit (initial): myfile1 -a50a5125768001a3ea263ffb7cafbc421a508153 42530e986dbb65877ed8d61ca0c816e425e5c62e CI 1534792759 +0100 commit: myfile2 -42530e986dbb65877ed8d61ca0c816e425e5c62e fc4712e93d74ad4fb68e2fd219ac253ae03e19a4 CI 1534792759 +0100 commit: myfile3 -fc4712e93d74ad4fb68e2fd219ac253ae03e19a4 e1eb418c0ff98940d4ea817eebcff5dcdde645ce CI 1534792759 +0100 commit: add submodule -e1eb418c0ff98940d4ea817eebcff5dcdde645ce fd65a5c96edfc884a78bfe3d0240cb8a7ea0a31a CI 1648348036 +1100 commit: test diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/HEAD b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/ORIG_HEAD b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/ORIG_HEAD deleted file mode 100644 index a70ff80c0..000000000 --- a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -42530e986dbb65877ed8d61ca0c816e425e5c62e diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/config b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/config deleted file mode 100644 index d14d72ba1..000000000 --- a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/config +++ /dev/null @@ -1,14 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true - worktree = ../../../other_repo -[remote "origin"] - url = /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleEnter/actual/other_repo - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/description b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/index b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/index deleted file mode 100644 index 304e77844..000000000 Binary files a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/index and /dev/null differ diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/info/exclude b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/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/submoduleEnter/expected/repo/.git_keep/modules/other_repo/logs/HEAD b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/logs/HEAD deleted file mode 100644 index ed71cbd0f..000000000 --- a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/logs/HEAD +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 fc4712e93d74ad4fb68e2fd219ac253ae03e19a4 Jesse Duffield 1534792759 +0100 clone: from /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleEnter/actual/other_repo -fc4712e93d74ad4fb68e2fd219ac253ae03e19a4 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield 1648348031 +1100 rebase -i (start): checkout 42530e986dbb65877ed8d61ca0c816e425e5c62e -42530e986dbb65877ed8d61ca0c816e425e5c62e 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield 1648348031 +1100 rebase -i (finish): returning to refs/heads/master -42530e986dbb65877ed8d61ca0c816e425e5c62e a50a5125768001a3ea263ffb7cafbc421a508153 Jesse Duffield 1648348032 +1100 rebase -i (start): checkout a50a5125768001a3ea263ffb7cafbc421a508153 -a50a5125768001a3ea263ffb7cafbc421a508153 a50a5125768001a3ea263ffb7cafbc421a508153 Jesse Duffield 1648348032 +1100 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/logs/refs/heads/master b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/logs/refs/heads/master deleted file mode 100644 index 36662576a..000000000 --- a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/logs/refs/heads/master +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 fc4712e93d74ad4fb68e2fd219ac253ae03e19a4 Jesse Duffield 1534792759 +0100 clone: from /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleEnter/actual/other_repo -fc4712e93d74ad4fb68e2fd219ac253ae03e19a4 42530e986dbb65877ed8d61ca0c816e425e5c62e Jesse Duffield 1648348031 +1100 rebase -i (finish): refs/heads/master onto 42530e986dbb65877ed8d61ca0c816e425e5c62e -42530e986dbb65877ed8d61ca0c816e425e5c62e a50a5125768001a3ea263ffb7cafbc421a508153 Jesse Duffield 1648348032 +1100 rebase -i (finish): refs/heads/master onto a50a5125768001a3ea263ffb7cafbc421a508153 diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/logs/refs/remotes/origin/HEAD b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/logs/refs/remotes/origin/HEAD deleted file mode 100644 index 259f2e9f2..000000000 --- a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/logs/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 fc4712e93d74ad4fb68e2fd219ac253ae03e19a4 Jesse Duffield 1534792759 +0100 clone: from /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/submoduleEnter/actual/other_repo diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e deleted file mode 100644 index 64d20cb1e..000000000 Binary files a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e and /dev/null differ diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/96/c588f28aac5a8ebd6430526697e82e46b3180c b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/96/c588f28aac5a8ebd6430526697e82e46b3180c deleted file mode 100644 index 56590efa1..000000000 Binary files a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/96/c588f28aac5a8ebd6430526697e82e46b3180c and /dev/null differ diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 deleted file mode 100644 index 5dd5f3236..000000000 --- a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/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/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/fc/4712e93d74ad4fb68e2fd219ac253ae03e19a4 b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/fc/4712e93d74ad4fb68e2fd219ac253ae03e19a4 deleted file mode 100644 index 95d1a3bc9..000000000 --- a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/objects/fc/4712e93d74ad4fb68e2fd219ac253ae03e19a4 +++ /dev/null @@ -1,2 +0,0 @@ -xK -0@] L&PDH&S,4z{{㭵k¥":!(gLR*o!($` =:8Fa-bJ-gdQN-Dwn'=C>xkwm\NzNu3W;/x9 \ No newline at end of file diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/packed-refs b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/packed-refs deleted file mode 100644 index ef4e386a6..000000000 --- a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -fc4712e93d74ad4fb68e2fd219ac253ae03e19a4 refs/remotes/origin/master diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/refs/heads/master b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/refs/heads/master deleted file mode 100644 index ab99dc85b..000000000 --- a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -a50a5125768001a3ea263ffb7cafbc421a508153 diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/refs/remotes/origin/HEAD b/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/refs/remotes/origin/HEAD deleted file mode 100644 index 6efe28fff..000000000 --- a/test/integration/submoduleEnter/expected/repo/.git_keep/modules/other_repo/refs/remotes/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/remotes/origin/master diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/submoduleEnter/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/objects/10/7f435787895be1068f01326df55c355a9d29b1 b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/10/7f435787895be1068f01326df55c355a9d29b1 deleted file mode 100644 index 199553fa6..000000000 Binary files a/test/integration/submoduleEnter/expected/repo/.git_keep/objects/10/7f435787895be1068f01326df55c355a9d29b1 and /dev/null differ diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/submoduleEnter/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/objects/2b/864257bf2d49adbad8785540d85030a60852ff b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/2b/864257bf2d49adbad8785540d85030a60852ff deleted file mode 100644 index 5bfb0cefc..000000000 Binary files a/test/integration/submoduleEnter/expected/repo/.git_keep/objects/2b/864257bf2d49adbad8785540d85030a60852ff and /dev/null differ diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e deleted file mode 100644 index 64d20cb1e..000000000 Binary files a/test/integration/submoduleEnter/expected/repo/.git_keep/objects/42/530e986dbb65877ed8d61ca0c816e425e5c62e and /dev/null differ diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/objects/59/a9aee220657762e2d1c60799a0f5b03137d906 b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/59/a9aee220657762e2d1c60799a0f5b03137d906 deleted file mode 100644 index e60d17459..000000000 Binary files a/test/integration/submoduleEnter/expected/repo/.git_keep/objects/59/a9aee220657762e2d1c60799a0f5b03137d906 and /dev/null differ diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/objects/96/c588f28aac5a8ebd6430526697e82e46b3180c b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/96/c588f28aac5a8ebd6430526697e82e46b3180c deleted file mode 100644 index 56590efa1..000000000 Binary files a/test/integration/submoduleEnter/expected/repo/.git_keep/objects/96/c588f28aac5a8ebd6430526697e82e46b3180c and /dev/null differ diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/a5/0a5125768001a3ea263ffb7cafbc421a508153 deleted file mode 100644 index 5dd5f3236..000000000 --- a/test/integration/submoduleEnter/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/submoduleEnter/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/submoduleEnter/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/submoduleEnter/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/objects/e1/eb418c0ff98940d4ea817eebcff5dcdde645ce b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/e1/eb418c0ff98940d4ea817eebcff5dcdde645ce deleted file mode 100644 index 9a2e552b8..000000000 --- a/test/integration/submoduleEnter/expected/repo/.git_keep/objects/e1/eb418c0ff98940d4ea817eebcff5dcdde645ce +++ /dev/null @@ -1,4 +0,0 @@ -xK -0@]d29 "tcL --5ox^7U,,DCJ` :RafMjɒ+KuWZȲd -Nl0pƇ~^`)3ZDsc럹ROm)xkwm\NzNu3W;/x9 \ No newline at end of file diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/objects/fd/65a5c96edfc884a78bfe3d0240cb8a7ea0a31a b/test/integration/submoduleEnter/expected/repo/.git_keep/objects/fd/65a5c96edfc884a78bfe3d0240cb8a7ea0a31a deleted file mode 100644 index f431c893b..000000000 --- a/test/integration/submoduleEnter/expected/repo/.git_keep/objects/fd/65a5c96edfc884a78bfe3d0240cb8a7ea0a31a +++ /dev/null @@ -1,4 +0,0 @@ -xM -1 @a=E$ӦMADp5Ou1w-^]xńD,BQȉ n -UGSRAM^jx -'NEJZmM*&l6m7)yuR$99 \ No newline at end of file diff --git a/test/integration/submoduleEnter/expected/repo/.git_keep/refs/heads/master b/test/integration/submoduleEnter/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 35e1a490a..000000000 --- a/test/integration/submoduleEnter/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -fd65a5c96edfc884a78bfe3d0240cb8a7ea0a31a diff --git a/test/integration/submoduleEnter/expected/repo/.gitmodules_keep b/test/integration/submoduleEnter/expected/repo/.gitmodules_keep deleted file mode 100644 index 2b864257b..000000000 --- a/test/integration/submoduleEnter/expected/repo/.gitmodules_keep +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "other_repo"] - path = other_repo - url = ../other_repo diff --git a/test/integration/submoduleEnter/expected/repo/myfile1 b/test/integration/submoduleEnter/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/submoduleEnter/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/submoduleEnter/expected/repo/myfile2 b/test/integration/submoduleEnter/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/submoduleEnter/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/submoduleEnter/expected/repo/myfile3 b/test/integration/submoduleEnter/expected/repo/myfile3 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/submoduleEnter/expected/repo/myfile3 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/submoduleEnter/expected/repo/other_repo/.git_keep b/test/integration/submoduleEnter/expected/repo/other_repo/.git_keep deleted file mode 100644 index 32e5ae2e6..000000000 --- a/test/integration/submoduleEnter/expected/repo/other_repo/.git_keep +++ /dev/null @@ -1 +0,0 @@ -gitdir: ../.git/modules/other_repo diff --git a/test/integration/submoduleEnter/expected/repo/other_repo/myfile1 b/test/integration/submoduleEnter/expected/repo/other_repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/submoduleEnter/expected/repo/other_repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/submoduleEnter/recording.json b/test/integration/submoduleEnter/recording.json deleted file mode 100644 index 568b008b0..000000000 --- a/test/integration/submoduleEnter/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":737,"Mod":0,"Key":256,"Ch":93},{"Timestamp":1306,"Mod":0,"Key":13,"Ch":13},{"Timestamp":1937,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2162,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2462,"Mod":0,"Key":256,"Ch":100},{"Timestamp":2687,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3049,"Mod":0,"Key":256,"Ch":100},{"Timestamp":3242,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3862,"Mod":0,"Key":27,"Ch":0},{"Timestamp":5177,"Mod":0,"Key":256,"Ch":91},{"Timestamp":6272,"Mod":0,"Key":256,"Ch":32},{"Timestamp":6752,"Mod":0,"Key":256,"Ch":99},{"Timestamp":7007,"Mod":0,"Key":256,"Ch":116},{"Timestamp":7051,"Mod":0,"Key":256,"Ch":101},{"Timestamp":7232,"Mod":0,"Key":256,"Ch":115},{"Timestamp":7276,"Mod":0,"Key":256,"Ch":116},{"Timestamp":7547,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8251,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/submoduleEnter/setup.sh b/test/integration/submoduleEnter/setup.sh deleted file mode 100644 index a38c6045b..000000000 --- a/test/integration/submoduleEnter/setup.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -export GIT_COMMITTER_DATE="Mon 20 Aug 2018 20:19:19 BST" -export GIT_AUTHOR_DATE="Mon 20 Aug 2018 20:19:19 BST" - -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 test2 > myfile3 -git add . -git commit -am "myfile3" - -cd .. -git clone --bare ./repo other_repo -cd repo - -git -c protocol.file.allow=always submodule add ../other_repo -git commit -am "add submodule" diff --git a/test/integration/submoduleEnter/test.json b/test/integration/submoduleEnter/test.json deleted file mode 100644 index 7bc6ff8ba..000000000 --- a/test/integration/submoduleEnter/test.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "description": "Add submodule and enter. We enter the submodule, remove a couple of commits, and then stage the change in the parent repo", - "speed": 5 -}