diff --git a/pkg/gui/confirmation_panel.go b/pkg/gui/confirmation_panel.go index b8f79c8a2..4a7822076 100644 --- a/pkg/gui/confirmation_panel.go +++ b/pkg/gui/confirmation_panel.go @@ -290,8 +290,13 @@ func (gui *Gui) clearConfirmationViewKeyBindings() { func (gui *Gui) refreshSuggestions() { gui.suggestionsAsyncHandler.Do(func() func() { - suggestions := gui.findSuggestions(gui.c.GetPromptInput()) - return func() { gui.setSuggestions(suggestions) } + findSuggestionsFn := gui.findSuggestions + if findSuggestionsFn != nil { + suggestions := gui.findSuggestions(gui.c.GetPromptInput()) + return func() { gui.setSuggestions(suggestions) } + } else { + return func() {} + } }) } diff --git a/pkg/integration/components/shell.go b/pkg/integration/components/shell.go index f54d0fa5a..9b7beca7c 100644 --- a/pkg/integration/components/shell.go +++ b/pkg/integration/components/shell.go @@ -170,3 +170,32 @@ func (self *Shell) SetConfig(key string, value string) *Shell { self.RunCommand(fmt.Sprintf(`git config --local "%s" %s`, key, value)) return self } + +// creates a clone of the repo in a sibling directory and adds the clone +// as a remote, then fetches it. +func (self *Shell) CloneIntoRemote(name string) *Shell { + self.RunCommand(fmt.Sprintf("git clone --bare . ../%s", name)) + self.RunCommand(fmt.Sprintf("git remote add %s ../%s", name, name)) + self.RunCommand(fmt.Sprintf("git fetch %s", name)) + + return self +} + +// e.g. branch: 'master', upstream: 'origin/master' +func (self *Shell) SetBranchUpstream(branch string, upstream string) *Shell { + self.RunCommand(fmt.Sprintf("git branch --set-upstream-to=%s %s", upstream, branch)) + + return self +} + +func (self *Shell) RemoveRemoteBranch(remoteName string, branch string) *Shell { + self.RunCommand(fmt.Sprintf("git -C ../%s branch -d %s", remoteName, branch)) + + return self +} + +func (self *Shell) HardReset(ref string) *Shell { + self.RunCommand(fmt.Sprintf("git reset --hard %s", ref)) + + return self +} diff --git a/pkg/integration/tests/file/exclude_gitignore.go b/pkg/integration/tests/file/exclude_gitignore.go deleted file mode 100644 index 10ea62f15..000000000 --- a/pkg/integration/tests/file/exclude_gitignore.go +++ /dev/null @@ -1,39 +0,0 @@ -package file - -import ( - "github.com/jesseduffield/lazygit/pkg/config" - . "github.com/jesseduffield/lazygit/pkg/integration/components" -) - -var ExcludeGitignore = NewIntegrationTest(NewIntegrationTestArgs{ - Description: "Failed attempt at excluding and ignoring the .gitignore file", - ExtraCmdArgs: "", - Skip: false, - SetupConfig: func(config *config.AppConfig) { - }, - SetupRepo: func(shell *Shell) { - shell.CreateFile(".gitignore", "") - }, - Run: func(t *TestDriver, keys config.KeybindingConfig) { - t.Views().Files(). - IsFocused(). - Lines( - Contains(`?? .gitignore`).IsSelected(), - ). - Press(keys.Files.IgnoreFile). - Tap(func() { - t.ExpectPopup().Menu().Title(Equals("ignore or exclude file")).Select(Contains("add to .git/info/exclude")).Confirm() - - t.ExpectPopup().Alert().Title(Equals("Error")).Content(Equals("Cannot exclude .gitignore")).Confirm() - }). - Press(keys.Files.IgnoreFile). - Tap(func() { - t.ExpectPopup().Menu().Title(Equals("ignore or exclude file")).Select(Contains("add to .gitignore")).Confirm() - - t.ExpectPopup().Alert().Title(Equals("Error")).Content(Equals("Cannot ignore .gitignore")).Confirm() - }) - - t.FileSystem().FileContent(".gitignore", Equals("")) - t.FileSystem().FileContent(".git/info/exclude", DoesNotContain(".gitignore")) - }, -}) diff --git a/pkg/integration/tests/file/gitignore.go b/pkg/integration/tests/file/gitignore.go new file mode 100644 index 000000000..eca835e82 --- /dev/null +++ b/pkg/integration/tests/file/gitignore.go @@ -0,0 +1,63 @@ +package file + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var GitIgnore = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Verify that we can't ignore the .gitignore file, then ignore/exclude other files", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) { + }, + SetupRepo: func(shell *Shell) { + shell.CreateFile(".gitignore", "") + shell.CreateFile("toExclude", "") + shell.CreateFile("toIgnore", "") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Lines( + Contains(`?? .gitignore`).IsSelected(), + Contains(`?? toExclude`), + Contains(`?? toIgnore`), + ). + Press(keys.Files.IgnoreFile). + // ensure we can't exclude the .gitignore file + Tap(func() { + t.ExpectPopup().Menu().Title(Equals("ignore or exclude file")).Select(Contains("add to .git/info/exclude")).Confirm() + + t.ExpectPopup().Alert().Title(Equals("Error")).Content(Equals("Cannot exclude .gitignore")).Confirm() + }). + Press(keys.Files.IgnoreFile). + // ensure we can't ignore the .gitignore file + Tap(func() { + t.ExpectPopup().Menu().Title(Equals("ignore or exclude file")).Select(Contains("add to .gitignore")).Confirm() + + t.ExpectPopup().Alert().Title(Equals("Error")).Content(Equals("Cannot ignore .gitignore")).Confirm() + + t.FileSystem().FileContent(".gitignore", Equals("")) + t.FileSystem().FileContent(".git/info/exclude", DoesNotContain(".gitignore")) + }). + SelectNextItem(). + Press(keys.Files.IgnoreFile). + // exclude a file + Tap(func() { + t.ExpectPopup().Menu().Title(Equals("ignore or exclude file")).Select(Contains("add to .git/info/exclude")).Confirm() + + t.FileSystem().FileContent(".gitignore", Equals("")) + t.FileSystem().FileContent(".git/info/exclude", Contains("toExclude")) + }). + SelectNextItem(). + Press(keys.Files.IgnoreFile). + // ignore a file + Tap(func() { + t.ExpectPopup().Menu().Title(Equals("ignore or exclude file")).Select(Contains("add to .gitignore")).Confirm() + + t.FileSystem().FileContent(".gitignore", Equals("toIgnore\n")) + t.FileSystem().FileContent(".git/info/exclude", Contains("toExclude")) + }) + }, +}) diff --git a/pkg/integration/tests/filter_by_path/cli.go b/pkg/integration/tests/filter_by_path/cli.go new file mode 100644 index 000000000..0de95986e --- /dev/null +++ b/pkg/integration/tests/filter_by_path/cli.go @@ -0,0 +1,20 @@ +package filter_by_path + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var CliArg = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Filter commits by file path, using CLI arg", + ExtraCmdArgs: "-f filterFile", + Skip: false, + SetupConfig: func(config *config.AppConfig) { + }, + SetupRepo: func(shell *Shell) { + commonSetup(shell) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + postFilterTest(t) + }, +}) diff --git a/pkg/integration/tests/filter_by_path/select_file.go b/pkg/integration/tests/filter_by_path/select_file.go new file mode 100644 index 000000000..6722958dd --- /dev/null +++ b/pkg/integration/tests/filter_by_path/select_file.go @@ -0,0 +1,76 @@ +package filter_by_path + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var SelectFile = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Filter commits by file path, by finding file in UI and filtering on it", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) { + }, + SetupRepo: func(shell *Shell) { + commonSetup(shell) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Lines( + Contains(`only filterFile`).IsSelected(), + Contains(`only otherFile`), + Contains(`both files`), + ). + PressEnter() + + // when you click into the commit itself, you see all files from that commit + t.Views().CommitFiles(). + IsFocused(). + Lines( + Contains(`filterFile`).IsSelected(), + ). + Press(keys.Universal.FilteringMenu) + + t.ExpectPopup().Menu().Title(Equals("Filtering")).Select(Contains("filter by 'filterFile'")).Confirm() + + postFilterTest(t) + }, +}) + +func commonSetup(shell *Shell) { + shell.CreateFileAndAdd("filterFile", "original filterFile content") + shell.CreateFileAndAdd("otherFile", "original otherFile content") + shell.Commit("both files") + + shell.UpdateFileAndAdd("otherFile", "new otherFile content") + shell.Commit("only otherFile") + + shell.UpdateFileAndAdd("filterFile", "new filterFile content") + shell.Commit("only filterFile") +} + +func postFilterTest(t *TestDriver) { + t.Views().Information().Content(Contains("filtering by 'filterFile'")) + + t.Views().Commits(). + IsFocused(). + Lines( + Contains(`only filterFile`).IsSelected(), + Contains(`both files`), + ). + SelectNextItem(). + PressEnter() + + // we only show the filtered file's changes in the main view + t.Views().Main(). + Content(Contains("filterFile").DoesNotContain("otherFile")) + + // when you click into the commit itself, you see all files from that commit + t.Views().CommitFiles(). + IsFocused(). + Lines( + Contains(`filterFile`), + Contains(`otherFile`), + ) +} diff --git a/pkg/integration/tests/filter_by_path/type_file.go b/pkg/integration/tests/filter_by_path/type_file.go new file mode 100644 index 000000000..23ec0ff1d --- /dev/null +++ b/pkg/integration/tests/filter_by_path/type_file.go @@ -0,0 +1,35 @@ +package filter_by_path + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var TypeFile = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Filter commits by file path, by finding file in UI and filtering on it", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) { + }, + SetupRepo: func(shell *Shell) { + commonSetup(shell) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files(). + IsFocused(). + Press(keys.Universal.FilteringMenu) + + t.ExpectPopup().Menu(). + Title(Equals("Filtering")). + Select(Contains("enter path to filter by")). + Confirm() + + t.ExpectPopup().Prompt(). + Title(Equals("Enter path:")). + Type("filterF"). + SuggestionLines(Equals("filterFile")). + ConfirmFirstSuggestion() + + postFilterTest(t) + }, +}) diff --git a/pkg/integration/tests/sync/fetch_prune.go b/pkg/integration/tests/sync/fetch_prune.go new file mode 100644 index 000000000..765a4ad36 --- /dev/null +++ b/pkg/integration/tests/sync/fetch_prune.go @@ -0,0 +1,49 @@ +package sync + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var FetchPrune = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Fetch from the remote with the 'prune' option set in the git config", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) { + config.UserConfig.Git.AutoFetch = false + }, + SetupRepo: func(shell *Shell) { + // This option makes it so that git checks for deleted branches in the remote + // upon fetching. + shell.SetConfig("fetch.prune", "true") + + shell.EmptyCommit("my commit message") + + shell.NewBranch("branch_to_remove") + shell.Checkout("master") + shell.CloneIntoRemote("origin") + shell.SetBranchUpstream("master", "origin/master") + shell.SetBranchUpstream("branch_to_remove", "origin/branch_to_remove") + + // # unbenownst to our test repo we're removing the branch on the remote, so upon + // # fetching with prune: true we expect git to realise the remote branch is gone + shell.RemoveRemoteBranch("origin", "branch_to_remove") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Branches(). + Lines( + Contains("master"), + Contains("branch_to_remove").DoesNotContain("upstream gone"), + ) + + t.Views().Files(). + IsFocused(). + Press(keys.Files.Fetch) + + t.Views().Branches(). + Lines( + Contains("master"), + Contains("branch_to_remove").Contains("upstream gone"), + ) + }, +}) diff --git a/pkg/integration/tests/sync/rename_branch_and_pull.go b/pkg/integration/tests/sync/rename_branch_and_pull.go new file mode 100644 index 000000000..93e28dfc3 --- /dev/null +++ b/pkg/integration/tests/sync/rename_branch_and_pull.go @@ -0,0 +1,57 @@ +package sync + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var RenameBranchAndPull = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Rename a branch to no longer match its upstream, then pull from the upstream", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) { + config.UserConfig.Git.AutoFetch = false + }, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + shell.EmptyCommit("two") + + shell.CloneIntoRemote("origin") + shell.SetBranchUpstream("master", "origin/master") + + // remove the 'two' commit so that we have something to pull from the remote + shell.HardReset("HEAD^") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Lines( + Contains("one"), + ) + + t.Views().Branches(). + Focus(). + Lines( + Contains("master"), + ). + Press(keys.Branches.RenameBranch). + Tap(func() { + t.ExpectPopup().Confirmation(). + Title(Equals("rename branch")). + Content(Equals("This branch is tracking a remote. This action will only rename the local branch name, not the name of the remote branch. Continue?")). + Confirm() + + t.ExpectPopup().Prompt(). + Title(Contains("Enter new branch name")). + InitialText(Equals("master")). + Type("-local"). + Confirm() + }). + Press(keys.Universal.PullFiles) + + t.Views().Commits(). + Lines( + Contains("two"), + Contains("one"), + ) + }, +}) diff --git a/pkg/integration/tests/tests.go b/pkg/integration/tests/tests.go index da72f84ed..f7463d0da 100644 --- a/pkg/integration/tests/tests.go +++ b/pkg/integration/tests/tests.go @@ -18,9 +18,11 @@ import ( "github.com/jesseduffield/lazygit/pkg/integration/tests/custom_commands" "github.com/jesseduffield/lazygit/pkg/integration/tests/diff" "github.com/jesseduffield/lazygit/pkg/integration/tests/file" + "github.com/jesseduffield/lazygit/pkg/integration/tests/filter_by_path" "github.com/jesseduffield/lazygit/pkg/integration/tests/interactive_rebase" "github.com/jesseduffield/lazygit/pkg/integration/tests/misc" "github.com/jesseduffield/lazygit/pkg/integration/tests/stash" + "github.com/jesseduffield/lazygit/pkg/integration/tests/sync" ) // Here is where we lists the actual tests that will run. When you create a new test, @@ -54,7 +56,7 @@ var tests = []*components.IntegrationTest{ file.DirWithUntrackedFile, file.DiscardChanges, file.DiscardStagedChanges, - file.ExcludeGitignore, + file.GitIgnore, interactive_rebase.AmendMerge, interactive_rebase.One, stash.Rename, @@ -64,6 +66,11 @@ var tests = []*components.IntegrationTest{ diff.Diff, diff.DiffAndApplyPatch, diff.DiffCommits, + sync.FetchPrune, + sync.RenameBranchAndPull, + filter_by_path.CliArg, + filter_by_path.SelectFile, + filter_by_path.TypeFile, } func GetTests() []*components.IntegrationTest { diff --git a/test/integration/excludeMenu/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/excludeMenu/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 5852f4463..000000000 --- a/test/integration/excludeMenu/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -Initial commit diff --git a/test/integration/excludeMenu/expected/repo/.git_keep/FETCH_HEAD b/test/integration/excludeMenu/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/excludeMenu/expected/repo/.git_keep/HEAD b/test/integration/excludeMenu/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/excludeMenu/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/excludeMenu/expected/repo/.git_keep/config b/test/integration/excludeMenu/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/excludeMenu/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/excludeMenu/expected/repo/.git_keep/description b/test/integration/excludeMenu/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/excludeMenu/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/excludeMenu/expected/repo/.git_keep/index b/test/integration/excludeMenu/expected/repo/.git_keep/index deleted file mode 100644 index 65d675154..000000000 Binary files a/test/integration/excludeMenu/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/excludeMenu/expected/repo/.git_keep/info/exclude b/test/integration/excludeMenu/expected/repo/.git_keep/info/exclude deleted file mode 100644 index f5a9a36c0..000000000 --- a/test/integration/excludeMenu/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,9 +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 - -myfile1 \ No newline at end of file diff --git a/test/integration/excludeMenu/expected/repo/.git_keep/logs/HEAD b/test/integration/excludeMenu/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index d4002669d..000000000 --- a/test/integration/excludeMenu/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 129cdae0c4ccd050e8398bcb18b2ce1e4a5626f9 CI 1657012793 +1000 commit (initial): Initial commit diff --git a/test/integration/excludeMenu/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/excludeMenu/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index d4002669d..000000000 --- a/test/integration/excludeMenu/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 129cdae0c4ccd050e8398bcb18b2ce1e4a5626f9 CI 1657012793 +1000 commit (initial): Initial commit diff --git a/test/integration/excludeMenu/expected/repo/.git_keep/objects/12/9cdae0c4ccd050e8398bcb18b2ce1e4a5626f9 b/test/integration/excludeMenu/expected/repo/.git_keep/objects/12/9cdae0c4ccd050e8398bcb18b2ce1e4a5626f9 deleted file mode 100644 index ffa5ec652..000000000 Binary files a/test/integration/excludeMenu/expected/repo/.git_keep/objects/12/9cdae0c4ccd050e8398bcb18b2ce1e4a5626f9 and /dev/null differ diff --git a/test/integration/excludeMenu/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration/excludeMenu/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 deleted file mode 100644 index adf64119a..000000000 Binary files a/test/integration/excludeMenu/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 and /dev/null differ diff --git a/test/integration/excludeMenu/expected/repo/.git_keep/refs/heads/master b/test/integration/excludeMenu/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index d255339cd..000000000 --- a/test/integration/excludeMenu/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -129cdae0c4ccd050e8398bcb18b2ce1e4a5626f9 diff --git a/test/integration/excludeMenu/expected/repo/myfile1 b/test/integration/excludeMenu/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/excludeMenu/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/excludeMenu/recording.json b/test/integration/excludeMenu/recording.json deleted file mode 100644 index d45736788..000000000 --- a/test/integration/excludeMenu/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":788,"Mod":0,"Key":256,"Ch":105},{"Timestamp":2342,"Mod":0,"Key":256,"Ch":101},{"Timestamp":3429,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":238,"Height":61}]} \ No newline at end of file diff --git a/test/integration/excludeMenu/setup.sh b/test/integration/excludeMenu/setup.sh deleted file mode 100644 index bd74671ea..000000000 --- a/test/integration/excludeMenu/setup.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -git commit --allow-empty -m "Initial commit" - -echo test1 > myfile1 - diff --git a/test/integration/excludeMenu/test.json b/test/integration/excludeMenu/test.json deleted file mode 100644 index b2ef1f3f4..000000000 --- a/test/integration/excludeMenu/test.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "description": "In this test a file is added to .git/info/exclude using the ignore or exclude menu", - "speed": 5 -} \ No newline at end of file diff --git a/test/integration/fetchPrune/config/config.yml b/test/integration/fetchPrune/config/config.yml deleted file mode 100644 index a77fb48ed..000000000 --- a/test/integration/fetchPrune/config/config.yml +++ /dev/null @@ -1,10 +0,0 @@ -disableStartupPopups: true -git: - autoFetch: false -gui: - theme: - activeBorderColor: - - green - - bold - SelectedRangeBgcolor: - - reverse diff --git a/test/integration/fetchPrune/expected/origin/HEAD b/test/integration/fetchPrune/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/fetchPrune/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/fetchPrune/expected/origin/config b/test/integration/fetchPrune/expected/origin/config deleted file mode 100644 index 4caf7663f..000000000 --- a/test/integration/fetchPrune/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/fetchPrune/actual/./repo diff --git a/test/integration/fetchPrune/expected/origin/description b/test/integration/fetchPrune/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/fetchPrune/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/fetchPrune/expected/origin/info/exclude b/test/integration/fetchPrune/expected/origin/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/fetchPrune/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/fetchPrune/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/fetchPrune/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/fetchPrune/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/fetchPrune/expected/origin/objects/75/f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 b/test/integration/fetchPrune/expected/origin/objects/75/f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 deleted file mode 100644 index 965fc5498..000000000 --- a/test/integration/fetchPrune/expected/origin/objects/75/f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0@Q9ɤIcL!R"~H|*x\ -b0H JwnЏkKnvdJ"#wG=&]ξu2, \ No newline at end of file diff --git a/test/integration/fetchPrune/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/fetchPrune/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/fetchPrune/expected/origin/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/fetchPrune/expected/origin/packed-refs b/test/integration/fetchPrune/expected/origin/packed-refs deleted file mode 100644 index 37e4528a7..000000000 --- a/test/integration/fetchPrune/expected/origin/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 refs/heads/master diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/fetchPrune/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 3829ab872..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -myfile1 diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/FETCH_HEAD b/test/integration/fetchPrune/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index 800c8511d..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 branch 'master' of ../origin diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/HEAD b/test/integration/fetchPrune/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/config b/test/integration/fetchPrune/expected/repo/.git_keep/config deleted file mode 100644 index 957eae48a..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/config +++ /dev/null @@ -1,21 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true -[user] - email = CI@example.com - name = CI -[fetch] - prune = true -[remote "origin"] - url = ../origin - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master -[branch "other_branch"] - remote = origin - merge = refs/heads/other_branch diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/description b/test/integration/fetchPrune/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/fetchPrune/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/fetchPrune/expected/repo/.git_keep/index b/test/integration/fetchPrune/expected/repo/.git_keep/index deleted file mode 100644 index 6955ab197..000000000 Binary files a/test/integration/fetchPrune/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/info/exclude b/test/integration/fetchPrune/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/fetchPrune/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/fetchPrune/expected/repo/.git_keep/logs/HEAD b/test/integration/fetchPrune/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 639cde24f..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 CI 1648352761 +1100 commit (initial): myfile1 -75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 CI 1648352761 +1100 checkout: moving from master to other_branch -75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 CI 1648352761 +1100 checkout: moving from other_branch to master diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/fetchPrune/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index f44229efe..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 CI 1648352761 +1100 commit (initial): myfile1 diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/logs/refs/heads/other_branch b/test/integration/fetchPrune/expected/repo/.git_keep/logs/refs/heads/other_branch deleted file mode 100644 index 01e383d7f..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/logs/refs/heads/other_branch +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 CI 1648352761 +1100 branch: Created from HEAD diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/fetchPrune/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 7fe249171..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 CI 1648352761 +1100 fetch origin: storing head diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/fetchPrune/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/fetchPrune/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/objects/75/f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 b/test/integration/fetchPrune/expected/repo/.git_keep/objects/75/f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 deleted file mode 100644 index 965fc5498..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/objects/75/f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0@Q9ɤIcL!R"~H|*x\ -b0H JwnЏkKnvdJ"#wG=&]ξu2, \ No newline at end of file diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/fetchPrune/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/fetchPrune/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/packed-refs b/test/integration/fetchPrune/expected/repo/.git_keep/packed-refs deleted file mode 100644 index 250f18738..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/packed-refs +++ /dev/null @@ -1 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/refs/heads/master b/test/integration/fetchPrune/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 817ade7eb..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/refs/heads/other_branch b/test/integration/fetchPrune/expected/repo/.git_keep/refs/heads/other_branch deleted file mode 100644 index 817ade7eb..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/refs/heads/other_branch +++ /dev/null @@ -1 +0,0 @@ -75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 diff --git a/test/integration/fetchPrune/expected/repo/.git_keep/refs/remotes/origin/master b/test/integration/fetchPrune/expected/repo/.git_keep/refs/remotes/origin/master deleted file mode 100644 index 817ade7eb..000000000 --- a/test/integration/fetchPrune/expected/repo/.git_keep/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -75f37fc5ae7e9967e9833b66beb2c9ee2f9f6c27 diff --git a/test/integration/fetchPrune/expected/repo/myfile1 b/test/integration/fetchPrune/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/fetchPrune/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/fetchPrune/recording.json b/test/integration/fetchPrune/recording.json deleted file mode 100644 index b24cbf0cb..000000000 --- a/test/integration/fetchPrune/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":608,"Mod":0,"Key":256,"Ch":102},{"Timestamp":1568,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/fetchPrune/setup.sh b/test/integration/fetchPrune/setup.sh deleted file mode 100644 index 87829a2e3..000000000 --- a/test/integration/fetchPrune/setup.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -# we're setting this to ensure that it's honoured by the fetch command -git config fetch.prune true - -echo test1 > myfile1 -git add . -git commit -am "myfile1" - -git checkout -b other_branch -git checkout master - -cd .. -git clone --bare ./repo origin - -cd repo - -git remote add origin ../origin -git fetch origin -git branch --set-upstream-to=origin/master master -git branch --set-upstream-to=origin/other_branch other_branch - -# unbenownst to our test repo we're removing the branch on the remote, so upon -# fetching with prune: true we expect git to realise the remote branch is gone -git -C ../origin branch -d other_branch diff --git a/test/integration/fetchPrune/test.json b/test/integration/fetchPrune/test.json deleted file mode 100644 index 3d696e153..000000000 --- a/test/integration/fetchPrune/test.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "description": "fetch from the remote with the 'prune' option set in the git config. Note this has a false positive until we find a way to show ls-remote origin in all tests when creating snapshots.", - "speed": 10 -} diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/HEAD b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/config b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/config deleted file mode 100644 index ccf112f58..000000000 --- a/test/integration/fetchRemoteBranchWithNonmatchingName/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/fetchRemoteBranchWithNonmatchingName/actual/./repo diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/description b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/info/exclude b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/test/integration/fetchRemoteBranchWithNonmatchingName/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/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/12/d38e54cd419303587ba4613fb1194ec5c9d04f b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/12/d38e54cd419303587ba4613fb1194ec5c9d04f deleted file mode 100644 index f43085f4d..000000000 Binary files a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/12/d38e54cd419303587ba4613fb1194ec5c9d04f and /dev/null differ diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba..000000000 Binary files a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/2f/6174050380438f14b16658a356e762435ca591 and /dev/null differ diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/3e/5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6 b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/3e/5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6 deleted file mode 100644 index 0b97b6ff4..000000000 --- a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/origin/objects/3e/5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6 +++ /dev/null @@ -1,3 +0,0 @@ -xA -0@Q9I -"BW=FL!R"~r*Jd ¬DjE 1654108479 +0200 commit (initial): myfile1 -3e5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6 12d38e54cd419303587ba4613fb1194ec5c9d04f CI 1654108479 +0200 commit: myfile2 -12d38e54cd419303587ba4613fb1194ec5c9d04f 72ee6cc86de71389b9c70e24c7d8c8837e7d3566 CI 1654108479 +0200 commit: myfile3 -72ee6cc86de71389b9c70e24c7d8c8837e7d3566 b090d7f0029e74de260f7458721b8edd1e618edc CI 1654108479 +0200 commit: myfile4 -b090d7f0029e74de260f7458721b8edd1e618edc 12d38e54cd419303587ba4613fb1194ec5c9d04f CI 1654108479 +0200 reset: moving to HEAD~2 -12d38e54cd419303587ba4613fb1194ec5c9d04f 0000000000000000000000000000000000000000 CI 1654108482 +0200 Branch: renamed refs/heads/master to refs/heads/master-local -0000000000000000000000000000000000000000 12d38e54cd419303587ba4613fb1194ec5c9d04f CI 1654108482 +0200 Branch: renamed refs/heads/master to refs/heads/master-local -12d38e54cd419303587ba4613fb1194ec5c9d04f b090d7f0029e74de260f7458721b8edd1e618edc CI 1654108482 +0200 pull --no-edit --ff-only origin master: Fast-forward diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/logs/refs/heads/master-local b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/logs/refs/heads/master-local deleted file mode 100644 index b930bd5b6..000000000 --- a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/logs/refs/heads/master-local +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 3e5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6 CI 1654108479 +0200 commit (initial): myfile1 -3e5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6 12d38e54cd419303587ba4613fb1194ec5c9d04f CI 1654108479 +0200 commit: myfile2 -12d38e54cd419303587ba4613fb1194ec5c9d04f 72ee6cc86de71389b9c70e24c7d8c8837e7d3566 CI 1654108479 +0200 commit: myfile3 -72ee6cc86de71389b9c70e24c7d8c8837e7d3566 b090d7f0029e74de260f7458721b8edd1e618edc CI 1654108479 +0200 commit: myfile4 -b090d7f0029e74de260f7458721b8edd1e618edc 12d38e54cd419303587ba4613fb1194ec5c9d04f CI 1654108479 +0200 reset: moving to HEAD~2 -12d38e54cd419303587ba4613fb1194ec5c9d04f 12d38e54cd419303587ba4613fb1194ec5c9d04f CI 1654108482 +0200 Branch: renamed refs/heads/master to refs/heads/master-local -12d38e54cd419303587ba4613fb1194ec5c9d04f b090d7f0029e74de260f7458721b8edd1e618edc CI 1654108482 +0200 pull --no-edit --ff-only origin master: Fast-forward diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/logs/refs/remotes/origin/master b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/logs/refs/remotes/origin/master deleted file mode 100644 index 3cb40d7d3..000000000 --- a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/logs/refs/remotes/origin/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 b090d7f0029e74de260f7458721b8edd1e618edc CI 1654108479 +0200 fetch origin: storing head diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/12/d38e54cd419303587ba4613fb1194ec5c9d04f b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/12/d38e54cd419303587ba4613fb1194ec5c9d04f deleted file mode 100644 index f43085f4d..000000000 Binary files a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/12/d38e54cd419303587ba4613fb1194ec5c9d04f and /dev/null differ diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba..000000000 Binary files a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 and /dev/null differ diff --git a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/3e/5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6 b/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/3e/5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6 deleted file mode 100644 index 0b97b6ff4..000000000 --- a/test/integration/fetchRemoteBranchWithNonmatchingName/expected/repo/.git_keep/objects/3e/5a250f3b6d2ea4ea93b3006aaceeb75bb8d0b6 +++ /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/fetchRemoteBranchWithNonmatchingName/test.json b/test/integration/fetchRemoteBranchWithNonmatchingName/test.json deleted file mode 100644 index dffe129cd..000000000 --- a/test/integration/fetchRemoteBranchWithNonmatchingName/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "allow unsetting the upstream of the current branch", "speed": 10 } diff --git a/test/integration/filterPath/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/filterPath/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/filterPath/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/filterPath/expected/repo/.git_keep/FETCH_HEAD b/test/integration/filterPath/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/filterPath/expected/repo/.git_keep/HEAD b/test/integration/filterPath/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/filterPath/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/filterPath/expected/repo/.git_keep/config b/test/integration/filterPath/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/filterPath/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/filterPath/expected/repo/.git_keep/description b/test/integration/filterPath/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/filterPath/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/filterPath/expected/repo/.git_keep/index b/test/integration/filterPath/expected/repo/.git_keep/index deleted file mode 100644 index 168285e76..000000000 Binary files a/test/integration/filterPath/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/filterPath/expected/repo/.git_keep/info/exclude b/test/integration/filterPath/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/filterPath/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/filterPath/expected/repo/.git_keep/logs/HEAD b/test/integration/filterPath/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 808615246..000000000 --- a/test/integration/filterPath/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 f3d94fa1d4be39b8daae35b82525bf357aa712de CI 1617671367 +1000 commit (initial): file0 -f3d94fa1d4be39b8daae35b82525bf357aa712de 4b9d1f9f9fc76b123a5c90cd8396390cac41a3e3 CI 1617671367 +1000 commit: file1 -4b9d1f9f9fc76b123a5c90cd8396390cac41a3e3 d7236d5f85ad303f5f23141661e4c8959610b70b CI 1617671367 +1000 commit: file2 -d7236d5f85ad303f5f23141661e4c8959610b70b f24812da035a21812bc4c73018349ac2f0a6ec39 CI 1617671367 +1000 commit: file1 and file2 -f24812da035a21812bc4c73018349ac2f0a6ec39 8b476a1094290d7251c56305e199eb2a203d8682 CI 1617671367 +1000 commit: file -8b476a1094290d7251c56305e199eb2a203d8682 af3ef564e968dbe92fb4e08a67dd5f835f43d4e8 CI 1617671375 +1000 commit: asd -af3ef564e968dbe92fb4e08a67dd5f835f43d4e8 22adc4567aba3d1a0acf28b4cef312922d516aeb CI 1617671383 +1000 commit: test diff --git a/test/integration/filterPath/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/filterPath/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 808615246..000000000 --- a/test/integration/filterPath/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 f3d94fa1d4be39b8daae35b82525bf357aa712de CI 1617671367 +1000 commit (initial): file0 -f3d94fa1d4be39b8daae35b82525bf357aa712de 4b9d1f9f9fc76b123a5c90cd8396390cac41a3e3 CI 1617671367 +1000 commit: file1 -4b9d1f9f9fc76b123a5c90cd8396390cac41a3e3 d7236d5f85ad303f5f23141661e4c8959610b70b CI 1617671367 +1000 commit: file2 -d7236d5f85ad303f5f23141661e4c8959610b70b f24812da035a21812bc4c73018349ac2f0a6ec39 CI 1617671367 +1000 commit: file1 and file2 -f24812da035a21812bc4c73018349ac2f0a6ec39 8b476a1094290d7251c56305e199eb2a203d8682 CI 1617671367 +1000 commit: file -8b476a1094290d7251c56305e199eb2a203d8682 af3ef564e968dbe92fb4e08a67dd5f835f43d4e8 CI 1617671375 +1000 commit: asd -af3ef564e968dbe92fb4e08a67dd5f835f43d4e8 22adc4567aba3d1a0acf28b4cef312922d516aeb CI 1617671383 +1000 commit: test diff --git a/test/integration/filterPath/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/filterPath/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/filterPath/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/filterPath/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/filterPath/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67..000000000 Binary files a/test/integration/filterPath/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 and /dev/null differ diff --git a/test/integration/filterPath/expected/repo/.git_keep/objects/22/adc4567aba3d1a0acf28b4cef312922d516aeb b/test/integration/filterPath/expected/repo/.git_keep/objects/22/adc4567aba3d1a0acf28b4cef312922d516aeb deleted file mode 100644 index 7d99988a7..000000000 Binary files a/test/integration/filterPath/expected/repo/.git_keep/objects/22/adc4567aba3d1a0acf28b4cef312922d516aeb and /dev/null differ diff --git a/test/integration/filterPath/expected/repo/.git_keep/objects/2e/a97a56215f6adbe991eaf0dcf61c7086880ea5 b/test/integration/filterPath/expected/repo/.git_keep/objects/2e/a97a56215f6adbe991eaf0dcf61c7086880ea5 deleted file mode 100644 index 0790c9b90..000000000 Binary files a/test/integration/filterPath/expected/repo/.git_keep/objects/2e/a97a56215f6adbe991eaf0dcf61c7086880ea5 and /dev/null differ diff --git a/test/integration/filterPath/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/filterPath/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d..000000000 Binary files a/test/integration/filterPath/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da and /dev/null differ diff --git a/test/integration/filterPath/expected/repo/.git_keep/objects/4b/9d1f9f9fc76b123a5c90cd8396390cac41a3e3 b/test/integration/filterPath/expected/repo/.git_keep/objects/4b/9d1f9f9fc76b123a5c90cd8396390cac41a3e3 deleted file mode 100644 index 1ea243810..000000000 Binary files a/test/integration/filterPath/expected/repo/.git_keep/objects/4b/9d1f9f9fc76b123a5c90cd8396390cac41a3e3 and /dev/null differ diff --git a/test/integration/filterPath/expected/repo/.git_keep/objects/77/9de836a10ac879fa919f48d5dc4f4ce11528e2 b/test/integration/filterPath/expected/repo/.git_keep/objects/77/9de836a10ac879fa919f48d5dc4f4ce11528e2 deleted file mode 100644 index ad968bd2f..000000000 Binary files a/test/integration/filterPath/expected/repo/.git_keep/objects/77/9de836a10ac879fa919f48d5dc4f4ce11528e2 and /dev/null differ diff --git a/test/integration/filterPath/expected/repo/.git_keep/objects/84/b823dc5fc92fcf08eb8c8545716232ce49bd45 b/test/integration/filterPath/expected/repo/.git_keep/objects/84/b823dc5fc92fcf08eb8c8545716232ce49bd45 deleted file mode 100644 index e51e74d64..000000000 Binary files a/test/integration/filterPath/expected/repo/.git_keep/objects/84/b823dc5fc92fcf08eb8c8545716232ce49bd45 and /dev/null differ diff --git a/test/integration/filterPath/expected/repo/.git_keep/objects/8b/476a1094290d7251c56305e199eb2a203d8682 b/test/integration/filterPath/expected/repo/.git_keep/objects/8b/476a1094290d7251c56305e199eb2a203d8682 deleted file mode 100644 index 8e06bcc67..000000000 Binary files a/test/integration/filterPath/expected/repo/.git_keep/objects/8b/476a1094290d7251c56305e199eb2a203d8682 and /dev/null differ diff --git a/test/integration/filterPath/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/filterPath/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06d..000000000 Binary files a/test/integration/filterPath/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c and /dev/null differ diff --git a/test/integration/filterPath/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/filterPath/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/filterPath/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/filterPath/expected/repo/.git_keep/objects/af/3ef564e968dbe92fb4e08a67dd5f835f43d4e8 b/test/integration/filterPath/expected/repo/.git_keep/objects/af/3ef564e968dbe92fb4e08a67dd5f835f43d4e8 deleted file mode 100644 index 316e3d05c..000000000 Binary files a/test/integration/filterPath/expected/repo/.git_keep/objects/af/3ef564e968dbe92fb4e08a67dd5f835f43d4e8 and /dev/null differ diff --git a/test/integration/filterPath/expected/repo/.git_keep/objects/b7/c728d5b4e9dfc210ec19f0549f25c94b766e4e b/test/integration/filterPath/expected/repo/.git_keep/objects/b7/c728d5b4e9dfc210ec19f0549f25c94b766e4e deleted file mode 100644 index 997378000..000000000 Binary files a/test/integration/filterPath/expected/repo/.git_keep/objects/b7/c728d5b4e9dfc210ec19f0549f25c94b766e4e and /dev/null differ diff --git a/test/integration/filterPath/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/filterPath/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/filterPath/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 +++ /dev/null @@ -1,2 +0,0 @@ -x+)JMU03c040031QHI5`ֶww.hT[H - yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/filterPath/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/filterPath/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/filterPath/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/filterPath/expected/repo/.git_keep/objects/d7/236d5f85ad303f5f23141661e4c8959610b70b b/test/integration/filterPath/expected/repo/.git_keep/objects/d7/236d5f85ad303f5f23141661e4c8959610b70b deleted file mode 100644 index a1504b27d..000000000 --- a/test/integration/filterPath/expected/repo/.git_keep/objects/d7/236d5f85ad303f5f23141661e4c8959610b70b +++ /dev/null @@ -1,2 +0,0 @@ -xA - E DG(U1# y|nn]C~(LfhsTRɳ@.eu)ﮧ38'f3(_˪/c>A_9WeŪ:6 \ No newline at end of file diff --git a/test/integration/filterPath/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/filterPath/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/filterPath/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/filterPath/expected/repo/.git_keep/objects/f2/4812da035a21812bc4c73018349ac2f0a6ec39 b/test/integration/filterPath/expected/repo/.git_keep/objects/f2/4812da035a21812bc4c73018349ac2f0a6ec39 deleted file mode 100644 index de38ddd8b..000000000 --- a/test/integration/filterPath/expected/repo/.git_keep/objects/f2/4812da035a21812bc4c73018349ac2f0a6ec39 +++ /dev/null @@ -1,2 +0,0 @@ -xK -0@]$$ "tcL zw[6w0\!DHQs*'LKveA&Q;v(dl(Fj[}5rL>I񻿶}[0 BV=:/k_b; \ No newline at end of file diff --git a/test/integration/filterPath/expected/repo/.git_keep/objects/f3/d94fa1d4be39b8daae35b82525bf357aa712de b/test/integration/filterPath/expected/repo/.git_keep/objects/f3/d94fa1d4be39b8daae35b82525bf357aa712de deleted file mode 100644 index cb9dd46d0..000000000 Binary files a/test/integration/filterPath/expected/repo/.git_keep/objects/f3/d94fa1d4be39b8daae35b82525bf357aa712de and /dev/null differ diff --git a/test/integration/filterPath/expected/repo/.git_keep/refs/heads/master b/test/integration/filterPath/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 6e1574559..000000000 --- a/test/integration/filterPath/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -22adc4567aba3d1a0acf28b4cef312922d516aeb diff --git a/test/integration/filterPath/expected/repo/file b/test/integration/filterPath/expected/repo/file deleted file mode 100644 index d234c5e05..000000000 --- a/test/integration/filterPath/expected/repo/file +++ /dev/null @@ -1 +0,0 @@ -test4 diff --git a/test/integration/filterPath/expected/repo/file0 b/test/integration/filterPath/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/filterPath/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/filterPath/expected/repo/file2 b/test/integration/filterPath/expected/repo/file2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/filterPath/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/filterPath/recording.json b/test/integration/filterPath/recording.json deleted file mode 100644 index 58818be45..000000000 --- a/test/integration/filterPath/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":1102,"Mod":0,"Key":13,"Ch":13},{"Timestamp":1422,"Mod":0,"Key":256,"Ch":32},{"Timestamp":1591,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1718,"Mod":0,"Key":256,"Ch":32},{"Timestamp":2391,"Mod":2,"Key":16,"Ch":16},{"Timestamp":3318,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3454,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3686,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4339,"Mod":0,"Key":27,"Ch":0},{"Timestamp":4725,"Mod":0,"Key":27,"Ch":0},{"Timestamp":5591,"Mod":0,"Key":260,"Ch":0},{"Timestamp":5903,"Mod":0,"Key":260,"Ch":0},{"Timestamp":6494,"Mod":0,"Key":256,"Ch":99},{"Timestamp":7046,"Mod":0,"Key":256,"Ch":97},{"Timestamp":7102,"Mod":0,"Key":256,"Ch":115},{"Timestamp":7157,"Mod":0,"Key":256,"Ch":100},{"Timestamp":7677,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8261,"Mod":0,"Key":259,"Ch":0},{"Timestamp":8558,"Mod":0,"Key":259,"Ch":0},{"Timestamp":8990,"Mod":0,"Key":258,"Ch":0},{"Timestamp":9270,"Mod":0,"Key":258,"Ch":0},{"Timestamp":9910,"Mod":0,"Key":13,"Ch":13},{"Timestamp":10614,"Mod":0,"Key":256,"Ch":32},{"Timestamp":11278,"Mod":2,"Key":16,"Ch":16},{"Timestamp":11894,"Mod":0,"Key":258,"Ch":0},{"Timestamp":12046,"Mod":0,"Key":258,"Ch":0},{"Timestamp":12335,"Mod":0,"Key":13,"Ch":13},{"Timestamp":12761,"Mod":0,"Key":27,"Ch":0},{"Timestamp":13080,"Mod":0,"Key":27,"Ch":0},{"Timestamp":13822,"Mod":0,"Key":260,"Ch":0},{"Timestamp":14022,"Mod":0,"Key":260,"Ch":0},{"Timestamp":14630,"Mod":0,"Key":256,"Ch":99},{"Timestamp":14894,"Mod":0,"Key":256,"Ch":116},{"Timestamp":14958,"Mod":0,"Key":256,"Ch":101},{"Timestamp":15150,"Mod":0,"Key":256,"Ch":115},{"Timestamp":15207,"Mod":0,"Key":256,"Ch":116},{"Timestamp":15558,"Mod":0,"Key":13,"Ch":13},{"Timestamp":16294,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/filterPath/setup.sh b/test/integration/filterPath/setup.sh deleted file mode 100644 index 460b35b25..000000000 --- a/test/integration/filterPath/setup.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -# need a history of commits each containing various files - -echo test0 > file0 -git add . -git commit -am file0 - -echo test1 > file1 -git add . -git commit -am file1 - -echo test2 > file2 -git add . -git commit -am "file2" - -echo test3 > file1 -echo test4 > file2 -git add . -git commit -am "file1 and file2" - -echo test4 > file -git add . -git commit -am "file" diff --git a/test/integration/filterPath/test.json b/test/integration/filterPath/test.json deleted file mode 100644 index 122b296b3..000000000 --- a/test/integration/filterPath/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "Open lazygit with a filter path given", "speed": 10, "extraCmdArgs": "-f file1" } diff --git a/test/integration/filterPath2/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/filterPath2/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/filterPath2/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/filterPath2/expected/repo/.git_keep/FETCH_HEAD b/test/integration/filterPath2/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/filterPath2/expected/repo/.git_keep/HEAD b/test/integration/filterPath2/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/filterPath2/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/filterPath2/expected/repo/.git_keep/config b/test/integration/filterPath2/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/filterPath2/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/filterPath2/expected/repo/.git_keep/description b/test/integration/filterPath2/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/filterPath2/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/filterPath2/expected/repo/.git_keep/index b/test/integration/filterPath2/expected/repo/.git_keep/index deleted file mode 100644 index 1f8068706..000000000 Binary files a/test/integration/filterPath2/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/filterPath2/expected/repo/.git_keep/info/exclude b/test/integration/filterPath2/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/filterPath2/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/filterPath2/expected/repo/.git_keep/logs/HEAD b/test/integration/filterPath2/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 3875aa5f3..000000000 --- a/test/integration/filterPath2/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,6 +0,0 @@ -0000000000000000000000000000000000000000 703f7069185227287623aaba7cdb0e56ae7a6c60 CI 1617671384 +1000 commit (initial): file0 -703f7069185227287623aaba7cdb0e56ae7a6c60 a5c053a7a46bce2775edb371a9aa97424b542ab7 CI 1617671384 +1000 commit: file1 -a5c053a7a46bce2775edb371a9aa97424b542ab7 6cdce80c062ba2c8f8758879834a936b84ead78c CI 1617671384 +1000 commit: file2 -6cdce80c062ba2c8f8758879834a936b84ead78c c5f9a8793f15aa0db816944424adb4303eb036a8 CI 1617671384 +1000 commit: file1 and file2 -c5f9a8793f15aa0db816944424adb4303eb036a8 e7c2bd00356720683d5bc4362ef5b92655fa8914 CI 1617671384 +1000 commit: file -e7c2bd00356720683d5bc4362ef5b92655fa8914 92ec47058a2894afbbbd69c5f79bff20c503e686 CI 1617671407 +1000 commit: test diff --git a/test/integration/filterPath2/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/filterPath2/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 3875aa5f3..000000000 --- a/test/integration/filterPath2/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,6 +0,0 @@ -0000000000000000000000000000000000000000 703f7069185227287623aaba7cdb0e56ae7a6c60 CI 1617671384 +1000 commit (initial): file0 -703f7069185227287623aaba7cdb0e56ae7a6c60 a5c053a7a46bce2775edb371a9aa97424b542ab7 CI 1617671384 +1000 commit: file1 -a5c053a7a46bce2775edb371a9aa97424b542ab7 6cdce80c062ba2c8f8758879834a936b84ead78c CI 1617671384 +1000 commit: file2 -6cdce80c062ba2c8f8758879834a936b84ead78c c5f9a8793f15aa0db816944424adb4303eb036a8 CI 1617671384 +1000 commit: file1 and file2 -c5f9a8793f15aa0db816944424adb4303eb036a8 e7c2bd00356720683d5bc4362ef5b92655fa8914 CI 1617671384 +1000 commit: file -e7c2bd00356720683d5bc4362ef5b92655fa8914 92ec47058a2894afbbbd69c5f79bff20c503e686 CI 1617671407 +1000 commit: test diff --git a/test/integration/filterPath2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/filterPath2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/filterPath2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/filterPath2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/filterPath2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67..000000000 Binary files a/test/integration/filterPath2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 and /dev/null differ diff --git a/test/integration/filterPath2/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/filterPath2/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d..000000000 Binary files a/test/integration/filterPath2/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da and /dev/null differ diff --git a/test/integration/filterPath2/expected/repo/.git_keep/objects/6c/dce80c062ba2c8f8758879834a936b84ead78c b/test/integration/filterPath2/expected/repo/.git_keep/objects/6c/dce80c062ba2c8f8758879834a936b84ead78c deleted file mode 100644 index 6381fde43..000000000 Binary files a/test/integration/filterPath2/expected/repo/.git_keep/objects/6c/dce80c062ba2c8f8758879834a936b84ead78c and /dev/null differ diff --git a/test/integration/filterPath2/expected/repo/.git_keep/objects/70/3f7069185227287623aaba7cdb0e56ae7a6c60 b/test/integration/filterPath2/expected/repo/.git_keep/objects/70/3f7069185227287623aaba7cdb0e56ae7a6c60 deleted file mode 100644 index 4b22d36d6..000000000 Binary files a/test/integration/filterPath2/expected/repo/.git_keep/objects/70/3f7069185227287623aaba7cdb0e56ae7a6c60 and /dev/null differ diff --git a/test/integration/filterPath2/expected/repo/.git_keep/objects/77/9de836a10ac879fa919f48d5dc4f4ce11528e2 b/test/integration/filterPath2/expected/repo/.git_keep/objects/77/9de836a10ac879fa919f48d5dc4f4ce11528e2 deleted file mode 100644 index ad968bd2f..000000000 Binary files a/test/integration/filterPath2/expected/repo/.git_keep/objects/77/9de836a10ac879fa919f48d5dc4f4ce11528e2 and /dev/null differ diff --git a/test/integration/filterPath2/expected/repo/.git_keep/objects/84/b823dc5fc92fcf08eb8c8545716232ce49bd45 b/test/integration/filterPath2/expected/repo/.git_keep/objects/84/b823dc5fc92fcf08eb8c8545716232ce49bd45 deleted file mode 100644 index e51e74d64..000000000 Binary files a/test/integration/filterPath2/expected/repo/.git_keep/objects/84/b823dc5fc92fcf08eb8c8545716232ce49bd45 and /dev/null differ diff --git a/test/integration/filterPath2/expected/repo/.git_keep/objects/92/ec47058a2894afbbbd69c5f79bff20c503e686 b/test/integration/filterPath2/expected/repo/.git_keep/objects/92/ec47058a2894afbbbd69c5f79bff20c503e686 deleted file mode 100644 index 59f937373..000000000 Binary files a/test/integration/filterPath2/expected/repo/.git_keep/objects/92/ec47058a2894afbbbd69c5f79bff20c503e686 and /dev/null differ diff --git a/test/integration/filterPath2/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/filterPath2/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06d..000000000 Binary files a/test/integration/filterPath2/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c and /dev/null differ diff --git a/test/integration/filterPath2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/filterPath2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/filterPath2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/filterPath2/expected/repo/.git_keep/objects/a5/c053a7a46bce2775edb371a9aa97424b542ab7 b/test/integration/filterPath2/expected/repo/.git_keep/objects/a5/c053a7a46bce2775edb371a9aa97424b542ab7 deleted file mode 100644 index af9315fee..000000000 Binary files a/test/integration/filterPath2/expected/repo/.git_keep/objects/a5/c053a7a46bce2775edb371a9aa97424b542ab7 and /dev/null differ diff --git a/test/integration/filterPath2/expected/repo/.git_keep/objects/c5/f9a8793f15aa0db816944424adb4303eb036a8 b/test/integration/filterPath2/expected/repo/.git_keep/objects/c5/f9a8793f15aa0db816944424adb4303eb036a8 deleted file mode 100644 index a47a39706..000000000 --- a/test/integration/filterPath2/expected/repo/.git_keep/objects/c5/f9a8793f15aa0db816944424adb4303eb036a8 +++ /dev/null @@ -1,2 +0,0 @@ -xK -0 )/vlJ)dc(L\ޠ0Oe8.PrQѲPʕ3tEB #ufCQ(Yэ*Ύ|HA$S?d[SL)穦N"Zො̈< \ No newline at end of file diff --git a/test/integration/filterPath2/expected/repo/.git_keep/objects/c8/68546458601b9c71b76b893f9020ecf7405528 b/test/integration/filterPath2/expected/repo/.git_keep/objects/c8/68546458601b9c71b76b893f9020ecf7405528 deleted file mode 100644 index 5310f4862..000000000 Binary files a/test/integration/filterPath2/expected/repo/.git_keep/objects/c8/68546458601b9c71b76b893f9020ecf7405528 and /dev/null differ diff --git a/test/integration/filterPath2/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/filterPath2/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/filterPath2/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 +++ /dev/null @@ -1,2 +0,0 @@ -x+)JMU03c040031QHI5`ֶww.hT[H - yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/filterPath2/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/filterPath2/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/filterPath2/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/filterPath2/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/filterPath2/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/filterPath2/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/filterPath2/expected/repo/.git_keep/objects/e7/c2bd00356720683d5bc4362ef5b92655fa8914 b/test/integration/filterPath2/expected/repo/.git_keep/objects/e7/c2bd00356720683d5bc4362ef5b92655fa8914 deleted file mode 100644 index bfd62d1d3..000000000 --- a/test/integration/filterPath2/expected/repo/.git_keep/objects/e7/c2bd00356720683d5bc4362ef5b92655fa8914 +++ /dev/null @@ -1,3 +0,0 @@ -xA - @Ѯ=BqtJ)dc:@lB7Gl/CC8D4a&j$J3$ -yu\ѫy}kM!!Eq L?z}徯r+[hCG`Qg=U[VQ?9 \ No newline at end of file diff --git a/test/integration/filterPath2/expected/repo/.git_keep/refs/heads/master b/test/integration/filterPath2/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 72fc50fcc..000000000 --- a/test/integration/filterPath2/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -92ec47058a2894afbbbd69c5f79bff20c503e686 diff --git a/test/integration/filterPath2/expected/repo/file b/test/integration/filterPath2/expected/repo/file deleted file mode 100644 index d234c5e05..000000000 --- a/test/integration/filterPath2/expected/repo/file +++ /dev/null @@ -1 +0,0 @@ -test4 diff --git a/test/integration/filterPath2/expected/repo/file0 b/test/integration/filterPath2/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/filterPath2/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/filterPath2/expected/repo/file1 b/test/integration/filterPath2/expected/repo/file1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/filterPath2/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/filterPath2/expected/repo/file2 b/test/integration/filterPath2/expected/repo/file2 deleted file mode 100644 index d234c5e05..000000000 --- a/test/integration/filterPath2/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -test4 diff --git a/test/integration/filterPath2/recording.json b/test/integration/filterPath2/recording.json deleted file mode 100644 index b857e533e..000000000 --- a/test/integration/filterPath2/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":650,"Mod":0,"Key":259,"Ch":0},{"Timestamp":970,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1547,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2370,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3506,"Mod":0,"Key":256,"Ch":120},{"Timestamp":4658,"Mod":0,"Key":256,"Ch":47},{"Timestamp":4971,"Mod":0,"Key":256,"Ch":102},{"Timestamp":5066,"Mod":0,"Key":256,"Ch":105},{"Timestamp":5106,"Mod":0,"Key":256,"Ch":108},{"Timestamp":5178,"Mod":0,"Key":256,"Ch":116},{"Timestamp":5266,"Mod":0,"Key":256,"Ch":101},{"Timestamp":5338,"Mod":0,"Key":256,"Ch":114},{"Timestamp":5426,"Mod":0,"Key":256,"Ch":45},{"Timestamp":5674,"Mod":0,"Key":256,"Ch":98},{"Timestamp":5698,"Mod":0,"Key":256,"Ch":121},{"Timestamp":5938,"Mod":0,"Key":256,"Ch":45},{"Timestamp":6148,"Mod":0,"Key":256,"Ch":112},{"Timestamp":6291,"Mod":0,"Key":256,"Ch":97},{"Timestamp":6330,"Mod":0,"Key":256,"Ch":116},{"Timestamp":6394,"Mod":0,"Key":256,"Ch":104},{"Timestamp":6666,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8498,"Mod":0,"Key":13,"Ch":13},{"Timestamp":10194,"Mod":0,"Key":13,"Ch":13},{"Timestamp":12275,"Mod":0,"Key":13,"Ch":13},{"Timestamp":13378,"Mod":0,"Key":256,"Ch":32},{"Timestamp":14442,"Mod":2,"Key":16,"Ch":16},{"Timestamp":15442,"Mod":0,"Key":258,"Ch":0},{"Timestamp":15706,"Mod":0,"Key":258,"Ch":0},{"Timestamp":16058,"Mod":0,"Key":13,"Ch":13},{"Timestamp":17286,"Mod":0,"Key":27,"Ch":0},{"Timestamp":17992,"Mod":0,"Key":27,"Ch":0},{"Timestamp":18625,"Mod":0,"Key":27,"Ch":0},{"Timestamp":19883,"Mod":0,"Key":260,"Ch":0},{"Timestamp":20210,"Mod":0,"Key":260,"Ch":0},{"Timestamp":20987,"Mod":0,"Key":256,"Ch":99},{"Timestamp":21386,"Mod":0,"Key":256,"Ch":116},{"Timestamp":21514,"Mod":0,"Key":256,"Ch":101},{"Timestamp":21722,"Mod":0,"Key":256,"Ch":115},{"Timestamp":21770,"Mod":0,"Key":256,"Ch":116},{"Timestamp":22338,"Mod":0,"Key":13,"Ch":13},{"Timestamp":23658,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/filterPath2/setup.sh b/test/integration/filterPath2/setup.sh deleted file mode 100644 index 460b35b25..000000000 --- a/test/integration/filterPath2/setup.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -# need a history of commits each containing various files - -echo test0 > file0 -git add . -git commit -am file0 - -echo test1 > file1 -git add . -git commit -am file1 - -echo test2 > file2 -git add . -git commit -am "file2" - -echo test3 > file1 -echo test4 > file2 -git add . -git commit -am "file1 and file2" - -echo test4 > file -git add . -git commit -am "file" diff --git a/test/integration/filterPath2/test.json b/test/integration/filterPath2/test.json deleted file mode 100644 index 682ac9c2f..000000000 --- a/test/integration/filterPath2/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "Open filter path mode from within lazygit", "speed": 10 } diff --git a/test/integration/filterPath3/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/filterPath3/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 9daeafb98..000000000 --- a/test/integration/filterPath3/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/test/integration/filterPath3/expected/repo/.git_keep/FETCH_HEAD b/test/integration/filterPath3/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/filterPath3/expected/repo/.git_keep/HEAD b/test/integration/filterPath3/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/filterPath3/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/filterPath3/expected/repo/.git_keep/config b/test/integration/filterPath3/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/filterPath3/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/filterPath3/expected/repo/.git_keep/description b/test/integration/filterPath3/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/filterPath3/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/filterPath3/expected/repo/.git_keep/index b/test/integration/filterPath3/expected/repo/.git_keep/index deleted file mode 100644 index 01d83d753..000000000 Binary files a/test/integration/filterPath3/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/filterPath3/expected/repo/.git_keep/info/exclude b/test/integration/filterPath3/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/filterPath3/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/filterPath3/expected/repo/.git_keep/logs/HEAD b/test/integration/filterPath3/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 96c158987..000000000 --- a/test/integration/filterPath3/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,6 +0,0 @@ -0000000000000000000000000000000000000000 8ed4f7b4eae8cc97d9add459348cc95e936b8f25 CI 1617671409 +1000 commit (initial): file0 -8ed4f7b4eae8cc97d9add459348cc95e936b8f25 c1a1ba9d2873d7163606bb5fdf46e50975db042b CI 1617671409 +1000 commit: file1 -c1a1ba9d2873d7163606bb5fdf46e50975db042b 72226d27a85fff688d32c134a22ebe650d6c2e41 CI 1617671409 +1000 commit: file2 -72226d27a85fff688d32c134a22ebe650d6c2e41 b35d7fa77c939890020952987eeb461f410297d8 CI 1617671409 +1000 commit: file1 and file2 -b35d7fa77c939890020952987eeb461f410297d8 231410172e8f51138f06d8dff963898fb1e97b30 CI 1617671409 +1000 commit: file -231410172e8f51138f06d8dff963898fb1e97b30 db6681a3e9fb9fb6ef524771cdc763904dd2b54d CI 1617671428 +1000 commit: test diff --git a/test/integration/filterPath3/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/filterPath3/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 96c158987..000000000 --- a/test/integration/filterPath3/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,6 +0,0 @@ -0000000000000000000000000000000000000000 8ed4f7b4eae8cc97d9add459348cc95e936b8f25 CI 1617671409 +1000 commit (initial): file0 -8ed4f7b4eae8cc97d9add459348cc95e936b8f25 c1a1ba9d2873d7163606bb5fdf46e50975db042b CI 1617671409 +1000 commit: file1 -c1a1ba9d2873d7163606bb5fdf46e50975db042b 72226d27a85fff688d32c134a22ebe650d6c2e41 CI 1617671409 +1000 commit: file2 -72226d27a85fff688d32c134a22ebe650d6c2e41 b35d7fa77c939890020952987eeb461f410297d8 CI 1617671409 +1000 commit: file1 and file2 -b35d7fa77c939890020952987eeb461f410297d8 231410172e8f51138f06d8dff963898fb1e97b30 CI 1617671409 +1000 commit: file -231410172e8f51138f06d8dff963898fb1e97b30 db6681a3e9fb9fb6ef524771cdc763904dd2b54d CI 1617671428 +1000 commit: test diff --git a/test/integration/filterPath3/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/filterPath3/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/filterPath3/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/filterPath3/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/filterPath3/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67..000000000 Binary files a/test/integration/filterPath3/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 and /dev/null differ diff --git a/test/integration/filterPath3/expected/repo/.git_keep/objects/23/1410172e8f51138f06d8dff963898fb1e97b30 b/test/integration/filterPath3/expected/repo/.git_keep/objects/23/1410172e8f51138f06d8dff963898fb1e97b30 deleted file mode 100644 index 13b3042dc..000000000 Binary files a/test/integration/filterPath3/expected/repo/.git_keep/objects/23/1410172e8f51138f06d8dff963898fb1e97b30 and /dev/null differ diff --git a/test/integration/filterPath3/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/filterPath3/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d..000000000 Binary files a/test/integration/filterPath3/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da and /dev/null differ diff --git a/test/integration/filterPath3/expected/repo/.git_keep/objects/72/226d27a85fff688d32c134a22ebe650d6c2e41 b/test/integration/filterPath3/expected/repo/.git_keep/objects/72/226d27a85fff688d32c134a22ebe650d6c2e41 deleted file mode 100644 index d1ad09fbd..000000000 Binary files a/test/integration/filterPath3/expected/repo/.git_keep/objects/72/226d27a85fff688d32c134a22ebe650d6c2e41 and /dev/null differ diff --git a/test/integration/filterPath3/expected/repo/.git_keep/objects/77/9de836a10ac879fa919f48d5dc4f4ce11528e2 b/test/integration/filterPath3/expected/repo/.git_keep/objects/77/9de836a10ac879fa919f48d5dc4f4ce11528e2 deleted file mode 100644 index ad968bd2f..000000000 Binary files a/test/integration/filterPath3/expected/repo/.git_keep/objects/77/9de836a10ac879fa919f48d5dc4f4ce11528e2 and /dev/null differ diff --git a/test/integration/filterPath3/expected/repo/.git_keep/objects/84/b823dc5fc92fcf08eb8c8545716232ce49bd45 b/test/integration/filterPath3/expected/repo/.git_keep/objects/84/b823dc5fc92fcf08eb8c8545716232ce49bd45 deleted file mode 100644 index e51e74d64..000000000 Binary files a/test/integration/filterPath3/expected/repo/.git_keep/objects/84/b823dc5fc92fcf08eb8c8545716232ce49bd45 and /dev/null differ diff --git a/test/integration/filterPath3/expected/repo/.git_keep/objects/8e/d4f7b4eae8cc97d9add459348cc95e936b8f25 b/test/integration/filterPath3/expected/repo/.git_keep/objects/8e/d4f7b4eae8cc97d9add459348cc95e936b8f25 deleted file mode 100644 index defb8aeab..000000000 --- a/test/integration/filterPath3/expected/repo/.git_keep/objects/8e/d4f7b4eae8cc97d9add459348cc95e936b8f25 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0Fa9c U4R"x|{޴6wS\b6C*=Wsޠ]0c_-Lk{!Yt]ۛ+ \ No newline at end of file diff --git a/test/integration/filterPath3/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/filterPath3/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06d..000000000 Binary files a/test/integration/filterPath3/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c and /dev/null differ diff --git a/test/integration/filterPath3/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/filterPath3/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/filterPath3/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/filterPath3/expected/repo/.git_keep/objects/b3/5d7fa77c939890020952987eeb461f410297d8 b/test/integration/filterPath3/expected/repo/.git_keep/objects/b3/5d7fa77c939890020952987eeb461f410297d8 deleted file mode 100644 index 69c3bb790..000000000 --- a/test/integration/filterPath3/expected/repo/.git_keep/objects/b3/5d7fa77c939890020952987eeb461f410297d8 +++ /dev/null @@ -1,3 +0,0 @@ -xK -0@]$3D<Ƙ`iK7px+kkSt*ĘE-s匹$^(d6u(ENR -[ ԡw;~m^ncl3ZkaN""#2_<{ \ No newline at end of file diff --git a/test/integration/filterPath3/expected/repo/.git_keep/objects/c1/a1ba9d2873d7163606bb5fdf46e50975db042b b/test/integration/filterPath3/expected/repo/.git_keep/objects/c1/a1ba9d2873d7163606bb5fdf46e50975db042b deleted file mode 100644 index 7938b29c6..000000000 --- a/test/integration/filterPath3/expected/repo/.git_keep/objects/c1/a1ba9d2873d7163606bb5fdf46e50975db042b +++ /dev/null @@ -1,3 +0,0 @@ -xM -0F]$?"BW=t2D'kkKGwU(6'KHuk MHЙw}u`3*ptfT -i0Np~mOn);gg5=NuS7uy3_ :n \ No newline at end of file diff --git a/test/integration/filterPath3/expected/repo/.git_keep/objects/c8/68546458601b9c71b76b893f9020ecf7405528 b/test/integration/filterPath3/expected/repo/.git_keep/objects/c8/68546458601b9c71b76b893f9020ecf7405528 deleted file mode 100644 index 5310f4862..000000000 Binary files a/test/integration/filterPath3/expected/repo/.git_keep/objects/c8/68546458601b9c71b76b893f9020ecf7405528 and /dev/null differ diff --git a/test/integration/filterPath3/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/filterPath3/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/filterPath3/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 +++ /dev/null @@ -1,2 +0,0 @@ -x+)JMU03c040031QHI5`ֶww.hT[H - yW5Ɨ(| ^-W(x9 \ No newline at end of file diff --git a/test/integration/filterPath3/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/filterPath3/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/filterPath3/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/filterPath3/expected/repo/.git_keep/objects/db/6681a3e9fb9fb6ef524771cdc763904dd2b54d b/test/integration/filterPath3/expected/repo/.git_keep/objects/db/6681a3e9fb9fb6ef524771cdc763904dd2b54d deleted file mode 100644 index 78eaa8524..000000000 --- a/test/integration/filterPath3/expected/repo/.git_keep/objects/db/6681a3e9fb9fb6ef524771cdc763904dd2b54d +++ /dev/null @@ -1,3 +0,0 @@ -xM -0@a9dEz&`l<=Ƿxemс -EXgr*r,Մ1+fw}u file0 -git add . -git commit -am file0 - -echo test1 > file1 -git add . -git commit -am file1 - -echo test2 > file2 -git add . -git commit -am "file2" - -echo test3 > file1 -echo test4 > file2 -git add . -git commit -am "file1 and file2" - -echo test4 > file -git add . -git commit -am "file" diff --git a/test/integration/filterPath3/test.json b/test/integration/filterPath3/test.json deleted file mode 100644 index 682ac9c2f..000000000 --- a/test/integration/filterPath3/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "Open filter path mode from within lazygit", "speed": 10 }