diff --git a/pkg/integration/components/shell.go b/pkg/integration/components/shell.go index ad6d195f5..bacd23a45 100644 --- a/pkg/integration/components/shell.go +++ b/pkg/integration/components/shell.go @@ -207,3 +207,9 @@ func (self *Shell) HardReset(ref string) *Shell { return self } + +func (self *Shell) Stash(message string) *Shell { + self.RunCommand(fmt.Sprintf("git stash -m \"%s\"", message)) + + return self +} diff --git a/pkg/integration/tests/stash/apply.go b/pkg/integration/tests/stash/apply.go new file mode 100644 index 000000000..dfaa5130a --- /dev/null +++ b/pkg/integration/tests/stash/apply.go @@ -0,0 +1,43 @@ +package stash + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var Apply = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Apply a stash entry", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("initial commit") + shell.CreateFile("file", "content") + shell.GitAddAll() + shell.Stash("stash one") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files().IsEmpty() + + t.Views().Stash(). + Focus(). + Lines( + Contains("stash one").IsSelected(), + ). + PressPrimaryAction(). + Tap(func() { + t.ExpectPopup().Confirmation(). + Title(Equals("Stash apply")). + Content(Contains("Are you sure you want to apply this stash entry?")). + Confirm() + }). + Lines( + Contains("stash one").IsSelected(), + ) + + t.Views().Files(). + Lines( + Contains("file"), + ) + }, +}) diff --git a/pkg/integration/tests/stash/apply_patch.go b/pkg/integration/tests/stash/apply_patch.go new file mode 100644 index 000000000..f8bf498ba --- /dev/null +++ b/pkg/integration/tests/stash/apply_patch.go @@ -0,0 +1,53 @@ +package stash + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var ApplyPatch = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Restore part of a stash entry via applying a custom patch", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("initial commit") + shell.CreateFile("myfile", "content") + shell.CreateFile("myfile2", "content") + shell.GitAddAll() + shell.Stash("stash one") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files().IsEmpty() + + t.Views().Stash(). + Focus(). + Lines( + Contains("stash one").IsSelected(), + ). + PressEnter(). + Tap(func() { + t.Views().CommitFiles(). + IsFocused(). + Lines( + Contains("myfile").IsSelected(), + Contains("myfile2"), + ). + PressPrimaryAction() + + t.Views().Information().Content(Contains("building patch")) + + t.Views(). + CommitFiles(). + Press(keys.Universal.CreatePatchOptionsMenu) + + t.ExpectPopup().Menu(). + Title(Equals("Patch Options")). + Select(MatchesRegexp(`apply patch$`)).Confirm() + }) + + t.Views().Files().Lines( + Contains("myfile"), + ) + }, +}) diff --git a/pkg/integration/tests/stash/create_branch.go b/pkg/integration/tests/stash/create_branch.go new file mode 100644 index 000000000..e6ea9c40c --- /dev/null +++ b/pkg/integration/tests/stash/create_branch.go @@ -0,0 +1,54 @@ +package stash + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var CreateBranch = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Create a branch from a stash entry", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("initial commit") + shell.CreateFile("myfile", "content") + shell.GitAddAll() + shell.Stash("stash one") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files().IsEmpty() + + t.Views().Stash(). + Focus(). + Lines( + Contains("stash one").IsSelected(), + ). + Press(keys.Universal.New). + Tap(func() { + t.ExpectPopup().Prompt(). + Title(Contains("New Branch Name (Branch is off of 'stash@{0}: On master: stash one'")). + Type("new_branch"). + Confirm() + }) + + t.Views().Files().IsEmpty() + + t.Views().Branches(). + IsFocused(). + Lines( + Contains("new_branch").IsSelected(), + Contains("master"), + ). + PressEnter() + + t.Views().SubCommits(). + Lines( + Contains("On master: stash one").IsSelected(), + MatchesRegexp(`index on master:.*initial commit`), + Contains("initial commit"), + ) + + t.Views().Main().Content(Contains("myfile | 1 +")) + }, +}) diff --git a/pkg/integration/tests/stash/drop.go b/pkg/integration/tests/stash/drop.go new file mode 100644 index 000000000..1450cfa30 --- /dev/null +++ b/pkg/integration/tests/stash/drop.go @@ -0,0 +1,38 @@ +package stash + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var Drop = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Drop a stash entry", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("initial commit") + shell.CreateFile("file", "content") + shell.GitAddAll() + shell.Stash("stash one") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files().IsEmpty() + + t.Views().Stash(). + Focus(). + Lines( + Contains("stash one").IsSelected(), + ). + Press(keys.Universal.Remove). + Tap(func() { + t.ExpectPopup().Confirmation(). + Title(Equals("Stash drop")). + Content(Contains("Are you sure you want to drop this stash entry?")). + Confirm() + }). + IsEmpty() + + t.Views().Files().IsEmpty() + }, +}) diff --git a/pkg/integration/tests/stash/pop.go b/pkg/integration/tests/stash/pop.go new file mode 100644 index 000000000..369e3e50d --- /dev/null +++ b/pkg/integration/tests/stash/pop.go @@ -0,0 +1,41 @@ +package stash + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var Pop = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Pop a stash entry", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("initial commit") + shell.CreateFile("file", "content") + shell.GitAddAll() + shell.Stash("stash one") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Files().IsEmpty() + + t.Views().Stash(). + Focus(). + Lines( + Contains("stash one").IsSelected(), + ). + Press(keys.Stash.PopStash). + Tap(func() { + t.ExpectPopup().Confirmation(). + Title(Equals("Stash pop")). + Content(Contains("Are you sure you want to pop this stash entry?")). + Confirm() + }). + IsEmpty() + + t.Views().Files(). + Lines( + Contains("file"), + ) + }, +}) diff --git a/pkg/integration/tests/stash/stash.go b/pkg/integration/tests/stash/stash.go index f88aac2d0..aa2393cd8 100644 --- a/pkg/integration/tests/stash/stash.go +++ b/pkg/integration/tests/stash/stash.go @@ -6,7 +6,7 @@ import ( ) var Stash = NewIntegrationTest(NewIntegrationTestArgs{ - Description: "Stashing files", + Description: "Stashing files directly (not going through the stash menu)", ExtraCmdArgs: "", Skip: false, SetupConfig: func(config *config.AppConfig) {}, @@ -23,9 +23,7 @@ var Stash = NewIntegrationTest(NewIntegrationTestArgs{ Lines( Contains("file"), ). - Press(keys.Files.ViewStashOptions) - - t.ExpectPopup().Menu().Title(Equals("Stash options")).Select(MatchesRegexp("stash all changes$")).Confirm() + Press(keys.Files.StashAllChanges) t.ExpectPopup().Prompt().Title(Equals("Stash changes")).Type("my stashed file").Confirm() diff --git a/pkg/integration/tests/stash/stash_all.go b/pkg/integration/tests/stash/stash_all.go new file mode 100644 index 000000000..494617d02 --- /dev/null +++ b/pkg/integration/tests/stash/stash_all.go @@ -0,0 +1,40 @@ +package stash + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var StashAll = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Stashing all changes (via the menu)", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("initial commit") + shell.CreateFile("file", "content") + shell.GitAddAll() + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Stash(). + IsEmpty() + + t.Views().Files(). + Lines( + Contains("file"), + ). + Press(keys.Files.ViewStashOptions) + + t.ExpectPopup().Menu().Title(Equals("Stash options")).Select(MatchesRegexp("stash all changes$")).Confirm() + + t.ExpectPopup().Prompt().Title(Equals("Stash changes")).Type("my stashed file").Confirm() + + t.Views().Stash(). + Lines( + Contains("my stashed file"), + ) + + t.Views().Files(). + IsEmpty() + }, +}) diff --git a/pkg/integration/tests/stash/stash_and_keep_index.go b/pkg/integration/tests/stash/stash_and_keep_index.go new file mode 100644 index 000000000..1f1e91152 --- /dev/null +++ b/pkg/integration/tests/stash/stash_and_keep_index.go @@ -0,0 +1,56 @@ +package stash + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var StashAndKeepIndex = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Stash staged changes", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("file-staged", "content") + shell.CreateFileAndAdd("file-unstaged", "content") + shell.EmptyCommit("initial commit") + shell.UpdateFileAndAdd("file-staged", "new content") + shell.UpdateFile("file-unstaged", "new content") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Stash(). + IsEmpty() + + t.Views().Files(). + Lines( + Contains("file-staged"), + Contains("file-unstaged"), + ). + Press(keys.Files.ViewStashOptions) + + t.ExpectPopup().Menu().Title(Equals("Stash options")).Select(Contains("stash all changes and keep index")).Confirm() + + t.ExpectPopup().Prompt().Title(Equals("Stash changes")).Type("my stashed file").Confirm() + + t.Views().Stash(). + Lines( + Contains("my stashed file"), + ) + + t.Views().Files(). + Lines( + Contains("file-staged"), + ) + + t.Views().Stash(). + Focus(). + PressEnter() + + t.Views().CommitFiles(). + IsFocused(). + Lines( + Contains("file-staged"), + Contains("file-unstaged"), + ) + }, +}) diff --git a/pkg/integration/tests/stash/stash_staged.go b/pkg/integration/tests/stash/stash_staged.go new file mode 100644 index 000000000..2fcd86c68 --- /dev/null +++ b/pkg/integration/tests/stash/stash_staged.go @@ -0,0 +1,55 @@ +package stash + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var StashStaged = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Stash staged changes", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("file-staged", "content") + shell.CreateFileAndAdd("file-unstaged", "content") + shell.EmptyCommit("initial commit") + shell.UpdateFileAndAdd("file-staged", "new content") + shell.UpdateFile("file-unstaged", "new content") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Stash(). + IsEmpty() + + t.Views().Files(). + Lines( + Contains("file-staged"), + Contains("file-unstaged"), + ). + Press(keys.Files.ViewStashOptions) + + t.ExpectPopup().Menu().Title(Equals("Stash options")).Select(MatchesRegexp("stash staged changes$")).Confirm() + + t.ExpectPopup().Prompt().Title(Equals("Stash changes")).Type("my stashed file").Confirm() + + t.Views().Stash(). + Lines( + Contains("my stashed file"), + ) + + t.Views().Files(). + Lines( + Contains("file-unstaged"), + ) + + t.Views().Stash(). + Focus(). + PressEnter() + + t.Views().CommitFiles(). + IsFocused(). + Lines( + Contains("file-staged").IsSelected(), + ) + }, +}) diff --git a/pkg/integration/tests/stash/stash_unstaged.go b/pkg/integration/tests/stash/stash_unstaged.go new file mode 100644 index 000000000..6e8877681 --- /dev/null +++ b/pkg/integration/tests/stash/stash_unstaged.go @@ -0,0 +1,55 @@ +package stash + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var StashUnstaged = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Stash unstaged changes", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("file-staged", "content") + shell.CreateFileAndAdd("file-unstaged", "content") + shell.EmptyCommit("initial commit") + shell.UpdateFileAndAdd("file-staged", "new content") + shell.UpdateFile("file-unstaged", "new content") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Stash(). + IsEmpty() + + t.Views().Files(). + Lines( + Contains("file-staged"), + Contains("file-unstaged"), + ). + Press(keys.Files.ViewStashOptions) + + t.ExpectPopup().Menu().Title(Equals("Stash options")).Select(MatchesRegexp("stash unstaged changes$")).Confirm() + + t.ExpectPopup().Prompt().Title(Equals("Stash changes")).Type("my stashed file").Confirm() + + t.Views().Stash(). + Lines( + Contains("my stashed file"), + ) + + t.Views().Files(). + Lines( + Contains("file-staged"), + ) + + t.Views().Stash(). + Focus(). + PressEnter() + + t.Views().CommitFiles(). + IsFocused(). + Lines( + Contains("file-unstaged").IsSelected(), + ) + }, +}) diff --git a/pkg/integration/tests/tests_gen.go b/pkg/integration/tests/tests_gen.go index 27ca095c1..c7cf462fe 100644 --- a/pkg/integration/tests/tests_gen.go +++ b/pkg/integration/tests/tests_gen.go @@ -81,9 +81,18 @@ var tests = []*components.IntegrationTest{ misc.ConfirmOnQuit, misc.InitialOpen, patch_building.CopyPatchToClipboard, + stash.Apply, + stash.ApplyPatch, + stash.CreateBranch, + stash.Drop, + stash.Pop, stash.Rename, stash.Stash, + stash.StashAll, + stash.StashAndKeepIndex, stash.StashIncludingUntrackedFiles, + stash.StashStaged, + stash.StashUnstaged, submodule.Add, submodule.Enter, submodule.Remove, diff --git a/test/integration/stash/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/stash/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 6c493ff74..000000000 --- a/test/integration/stash/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -file2 diff --git a/test/integration/stash/expected/repo/.git_keep/FETCH_HEAD b/test/integration/stash/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/stash/expected/repo/.git_keep/HEAD b/test/integration/stash/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/stash/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/stash/expected/repo/.git_keep/ORIG_HEAD b/test/integration/stash/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 70b2d64a5..000000000 --- a/test/integration/stash/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -6b1f87e5b74cd77d755d213e0850f4de02b3cdce diff --git a/test/integration/stash/expected/repo/.git_keep/config b/test/integration/stash/expected/repo/.git_keep/config deleted file mode 100644 index 596ebaeb3..000000000 --- a/test/integration/stash/expected/repo/.git_keep/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/stash/expected/repo/.git_keep/description b/test/integration/stash/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/stash/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/stash/expected/repo/.git_keep/index b/test/integration/stash/expected/repo/.git_keep/index deleted file mode 100644 index 1e08e2596..000000000 Binary files a/test/integration/stash/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/stash/expected/repo/.git_keep/info/exclude b/test/integration/stash/expected/repo/.git_keep/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/test/integration/stash/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/test/integration/stash/expected/repo/.git_keep/logs/HEAD b/test/integration/stash/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index d7185f04d..000000000 --- a/test/integration/stash/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 8c3123f6f4cee663b57398072df088c6f2dfeb9b CI 1650002552 +0200 commit (initial): file0 -8c3123f6f4cee663b57398072df088c6f2dfeb9b f7114350b59290905115d7918efe144eb2c62a76 CI 1650002552 +0200 commit: file1 -f7114350b59290905115d7918efe144eb2c62a76 6b1f87e5b74cd77d755d213e0850f4de02b3cdce CI 1650002552 +0200 commit: file2 -6b1f87e5b74cd77d755d213e0850f4de02b3cdce 6b1f87e5b74cd77d755d213e0850f4de02b3cdce CI 1650002559 +0200 reset: moving to HEAD -6b1f87e5b74cd77d755d213e0850f4de02b3cdce 6b1f87e5b74cd77d755d213e0850f4de02b3cdce CI 1650002567 +0200 reset: moving to HEAD diff --git a/test/integration/stash/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/stash/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index cacae4d5c..000000000 --- a/test/integration/stash/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 8c3123f6f4cee663b57398072df088c6f2dfeb9b CI 1650002552 +0200 commit (initial): file0 -8c3123f6f4cee663b57398072df088c6f2dfeb9b f7114350b59290905115d7918efe144eb2c62a76 CI 1650002552 +0200 commit: file1 -f7114350b59290905115d7918efe144eb2c62a76 6b1f87e5b74cd77d755d213e0850f4de02b3cdce CI 1650002552 +0200 commit: file2 diff --git a/test/integration/stash/expected/repo/.git_keep/logs/refs/stash b/test/integration/stash/expected/repo/.git_keep/logs/refs/stash deleted file mode 100644 index bcf0a385b..000000000 --- a/test/integration/stash/expected/repo/.git_keep/logs/refs/stash +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 be485112173592dea7b39c7efc3a6f52f43b71b9 CI 1650002559 +0200 On master: asd diff --git a/test/integration/stash/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/stash/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/stash/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/stash/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/stash/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67..000000000 Binary files a/test/integration/stash/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 and /dev/null differ diff --git a/test/integration/stash/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/stash/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d..000000000 Binary files a/test/integration/stash/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da and /dev/null differ diff --git a/test/integration/stash/expected/repo/.git_keep/objects/4f/9ff661c6c81b54d631d6d7c71399972e5c7a58 b/test/integration/stash/expected/repo/.git_keep/objects/4f/9ff661c6c81b54d631d6d7c71399972e5c7a58 deleted file mode 100644 index 258a8ab01..000000000 --- a/test/integration/stash/expected/repo/.git_keep/objects/4f/9ff661c6c81b54d631d6d7c71399972e5c7a58 +++ /dev/null @@ -1,2 +0,0 @@ -xK -1D]I0aƽۢKֹѼxX\r6K068o%#cd-ev5ltpQBm̙ѓ',&N)'QmηU>O9V/!!ǰqF:YWm^cuYAbaA \ No newline at end of file diff --git a/test/integration/stash/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 b/test/integration/stash/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 deleted file mode 100644 index 6a6f24362..000000000 Binary files a/test/integration/stash/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 and /dev/null differ diff --git a/test/integration/stash/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 b/test/integration/stash/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 deleted file mode 100644 index c84b87a17..000000000 --- a/test/integration/stash/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 +++ /dev/null @@ -1,3 +0,0 @@ -x+)JMUd040031QHI5`ֶww.hT[H - e"ǨS,gu"YH -$x~5(;rբW-Ж+^ \ No newline at end of file diff --git a/test/integration/stash/expected/repo/.git_keep/objects/6b/1f87e5b74cd77d755d213e0850f4de02b3cdce b/test/integration/stash/expected/repo/.git_keep/objects/6b/1f87e5b74cd77d755d213e0850f4de02b3cdce deleted file mode 100644 index 51688c4dc..000000000 Binary files a/test/integration/stash/expected/repo/.git_keep/objects/6b/1f87e5b74cd77d755d213e0850f4de02b3cdce and /dev/null differ diff --git a/test/integration/stash/expected/repo/.git_keep/objects/81/f9f45d5eca6c23bf25b4a53172bcfb5ceb3963 b/test/integration/stash/expected/repo/.git_keep/objects/81/f9f45d5eca6c23bf25b4a53172bcfb5ceb3963 deleted file mode 100644 index b2cb857d0..000000000 --- a/test/integration/stash/expected/repo/.git_keep/objects/81/f9f45d5eca6c23bf25b4a53172bcfb5ceb3963 +++ /dev/null @@ -1,2 +0,0 @@ -x -0E]+f/$c*"BW<&X0Mf‰vf6H8s"b!I@HZkd&Ǧ191IɁ fUb,= i~KDTƌpF(:QŲ&>P*ˋBf \ No newline at end of file diff --git a/test/integration/stash/expected/repo/.git_keep/objects/8c/3123f6f4cee663b57398072df088c6f2dfeb9b b/test/integration/stash/expected/repo/.git_keep/objects/8c/3123f6f4cee663b57398072df088c6f2dfeb9b deleted file mode 100644 index 0ae4c30f4..000000000 --- a/test/integration/stash/expected/repo/.git_keep/objects/8c/3123f6f4cee663b57398072df088c6f2dfeb9b +++ /dev/null @@ -1,3 +0,0 @@ -xA -0Fa9ԀU4)znպtdqR!'hP6'z{YY0?) -6֒+ \ No newline at end of file diff --git a/test/integration/stash/expected/repo/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 b/test/integration/stash/expected/repo/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 deleted file mode 100644 index 2a1928079..000000000 Binary files a/test/integration/stash/expected/repo/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 and /dev/null differ diff --git a/test/integration/stash/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/stash/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06d..000000000 Binary files a/test/integration/stash/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c and /dev/null differ diff --git a/test/integration/stash/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/stash/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/stash/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/stash/expected/repo/.git_keep/objects/be/485112173592dea7b39c7efc3a6f52f43b71b9 b/test/integration/stash/expected/repo/.git_keep/objects/be/485112173592dea7b39c7efc3a6f52f43b71b9 deleted file mode 100644 index 59e0babdb..000000000 Binary files a/test/integration/stash/expected/repo/.git_keep/objects/be/485112173592dea7b39c7efc3a6f52f43b71b9 and /dev/null differ diff --git a/test/integration/stash/expected/repo/.git_keep/objects/be/be684962b7b3a4d751f95173b31a051c7d46e7 b/test/integration/stash/expected/repo/.git_keep/objects/be/be684962b7b3a4d751f95173b31a051c7d46e7 deleted file mode 100644 index 99d6b4097..000000000 Binary files a/test/integration/stash/expected/repo/.git_keep/objects/be/be684962b7b3a4d751f95173b31a051c7d46e7 and /dev/null differ diff --git a/test/integration/stash/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a b/test/integration/stash/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a deleted file mode 100644 index ee4385f12..000000000 Binary files a/test/integration/stash/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a and /dev/null differ diff --git a/test/integration/stash/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/stash/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/stash/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/stash/expected/repo/.git_keep/objects/f7/114350b59290905115d7918efe144eb2c62a76 b/test/integration/stash/expected/repo/.git_keep/objects/f7/114350b59290905115d7918efe144eb2c62a76 deleted file mode 100644 index 734e0f0c1..000000000 Binary files a/test/integration/stash/expected/repo/.git_keep/objects/f7/114350b59290905115d7918efe144eb2c62a76 and /dev/null differ diff --git a/test/integration/stash/expected/repo/.git_keep/refs/heads/master b/test/integration/stash/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 70b2d64a5..000000000 --- a/test/integration/stash/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -6b1f87e5b74cd77d755d213e0850f4de02b3cdce diff --git a/test/integration/stash/expected/repo/.git_keep/refs/stash b/test/integration/stash/expected/repo/.git_keep/refs/stash deleted file mode 100644 index e627ae765..000000000 --- a/test/integration/stash/expected/repo/.git_keep/refs/stash +++ /dev/null @@ -1 +0,0 @@ -be485112173592dea7b39c7efc3a6f52f43b71b9 diff --git a/test/integration/stash/expected/repo/file0 b/test/integration/stash/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/stash/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/stash/expected/repo/file1 b/test/integration/stash/expected/repo/file1 deleted file mode 100644 index c7c7da3c6..000000000 --- a/test/integration/stash/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -hello there diff --git a/test/integration/stash/expected/repo/file2 b/test/integration/stash/expected/repo/file2 deleted file mode 100644 index c7c7da3c6..000000000 --- a/test/integration/stash/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -hello there diff --git a/test/integration/stash/expected/repo/file3 b/test/integration/stash/expected/repo/file3 deleted file mode 100644 index c7c7da3c6..000000000 --- a/test/integration/stash/expected/repo/file3 +++ /dev/null @@ -1 +0,0 @@ -hello there diff --git a/test/integration/stash/recording.json b/test/integration/stash/recording.json deleted file mode 100644 index cefefc363..000000000 --- a/test/integration/stash/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":1303,"Mod":0,"Key":256,"Ch":32},{"Timestamp":1922,"Mod":0,"Key":256,"Ch":83},{"Timestamp":5480,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6417,"Mod":0,"Key":256,"Ch":97},{"Timestamp":6506,"Mod":0,"Key":256,"Ch":115},{"Timestamp":6549,"Mod":0,"Key":256,"Ch":100},{"Timestamp":6874,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7610,"Mod":0,"Key":256,"Ch":53},{"Timestamp":9010,"Mod":0,"Key":256,"Ch":32},{"Timestamp":10032,"Mod":0,"Key":13,"Ch":13},{"Timestamp":10900,"Mod":0,"Key":256,"Ch":50},{"Timestamp":11662,"Mod":0,"Key":256,"Ch":107},{"Timestamp":12360,"Mod":0,"Key":256,"Ch":32},{"Timestamp":12902,"Mod":0,"Key":256,"Ch":115},{"Timestamp":13687,"Mod":0,"Key":256,"Ch":97},{"Timestamp":13772,"Mod":0,"Key":256,"Ch":115},{"Timestamp":13837,"Mod":0,"Key":256,"Ch":100},{"Timestamp":14294,"Mod":0,"Key":13,"Ch":13},{"Timestamp":15489,"Mod":0,"Key":256,"Ch":53},{"Timestamp":16960,"Mod":0,"Key":256,"Ch":103},{"Timestamp":17726,"Mod":0,"Key":13,"Ch":13},{"Timestamp":18592,"Mod":0,"Key":256,"Ch":50},{"Timestamp":19603,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":239,"Height":56}]} \ No newline at end of file diff --git a/test/integration/stash/setup.sh b/test/integration/stash/setup.sh deleted file mode 100644 index caff56b7d..000000000 --- a/test/integration/stash/setup.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -echo test0 > file0 -git add . -git commit -am file0 - -echo test1 > file1 -git add . -git commit -am file1 - -echo test2 > file2 -git add . -git commit -am file2 - -echo "hello there" > file1 -echo "hello there" > file2 -echo "hello there" > file3 diff --git a/test/integration/stash/test.json b/test/integration/stash/test.json deleted file mode 100644 index 4f9314caa..000000000 --- a/test/integration/stash/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "Stashing some files", "speed": 5 } diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/stashAllChanges/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 6c493ff74..000000000 --- a/test/integration/stashAllChanges/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -file2 diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/FETCH_HEAD b/test/integration/stashAllChanges/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/HEAD b/test/integration/stashAllChanges/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/stashAllChanges/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/ORIG_HEAD b/test/integration/stashAllChanges/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index b6b4a34f7..000000000 --- a/test/integration/stashAllChanges/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -cb66567aecbd1ceb7caebf1c3a3d16db28f4a54c diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/config b/test/integration/stashAllChanges/expected/repo/.git_keep/config deleted file mode 100644 index 596ebaeb3..000000000 --- a/test/integration/stashAllChanges/expected/repo/.git_keep/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/description b/test/integration/stashAllChanges/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/stashAllChanges/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/stashAllChanges/expected/repo/.git_keep/index b/test/integration/stashAllChanges/expected/repo/.git_keep/index deleted file mode 100644 index 1d75c1b32..000000000 Binary files a/test/integration/stashAllChanges/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/info/exclude b/test/integration/stashAllChanges/expected/repo/.git_keep/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/test/integration/stashAllChanges/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/logs/HEAD b/test/integration/stashAllChanges/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index f29e0fda8..000000000 --- a/test/integration/stashAllChanges/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,6 +0,0 @@ -0000000000000000000000000000000000000000 a52c63287cda99fcc917438c34ac8f9c67274d79 CI 1651830755 +0200 commit (initial): file0 -a52c63287cda99fcc917438c34ac8f9c67274d79 283a00085a0d95e814920f9eae7009789cee0eab CI 1651830755 +0200 commit: file1 -283a00085a0d95e814920f9eae7009789cee0eab cb66567aecbd1ceb7caebf1c3a3d16db28f4a54c CI 1651830755 +0200 commit: file2 -cb66567aecbd1ceb7caebf1c3a3d16db28f4a54c cb66567aecbd1ceb7caebf1c3a3d16db28f4a54c CI 1651830760 +0200 reset: moving to HEAD -cb66567aecbd1ceb7caebf1c3a3d16db28f4a54c cb66567aecbd1ceb7caebf1c3a3d16db28f4a54c CI 1651830769 +0200 reset: moving to HEAD -cb66567aecbd1ceb7caebf1c3a3d16db28f4a54c cb66567aecbd1ceb7caebf1c3a3d16db28f4a54c CI 1651830778 +0200 reset: moving to HEAD diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/stashAllChanges/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 3b9c06579..000000000 --- a/test/integration/stashAllChanges/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 a52c63287cda99fcc917438c34ac8f9c67274d79 CI 1651830755 +0200 commit (initial): file0 -a52c63287cda99fcc917438c34ac8f9c67274d79 283a00085a0d95e814920f9eae7009789cee0eab CI 1651830755 +0200 commit: file1 -283a00085a0d95e814920f9eae7009789cee0eab cb66567aecbd1ceb7caebf1c3a3d16db28f4a54c CI 1651830755 +0200 commit: file2 diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/logs/refs/stash b/test/integration/stashAllChanges/expected/repo/.git_keep/logs/refs/stash deleted file mode 100644 index a3a868578..000000000 --- a/test/integration/stashAllChanges/expected/repo/.git_keep/logs/refs/stash +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 df9f3a300512205640e5ff10b624072a10afddde CI 1651830760 +0200 On master: stash all -df9f3a300512205640e5ff10b624072a10afddde 6b8c369acb1897a5787e72b4c15d597d346f2b6a CI 1651830769 +0200 On master: stash newly tracked -6b8c369acb1897a5787e72b4c15d597d346f2b6a 5a70ee314842fb5f46b452d16bc4d95e7154d4b4 CI 1651830778 +0200 On master: stash with staged diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67..000000000 Binary files a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 and /dev/null differ diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/28/3a00085a0d95e814920f9eae7009789cee0eab b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/28/3a00085a0d95e814920f9eae7009789cee0eab deleted file mode 100644 index 45c762814..000000000 --- a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/28/3a00085a0d95e814920f9eae7009789cee0eab +++ /dev/null @@ -1,2 +0,0 @@ -xK -0@]$ɀU1N&X0=x pOcWj1%f_CnAjPlstf]8yDHP$DH2zg<|/Y \N)zkA-/u9 \ No newline at end of file diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da deleted file mode 100644 index ea6cd3866..000000000 Binary files a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da and /dev/null differ diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d..000000000 Binary files a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da and /dev/null differ diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 deleted file mode 100644 index 8535af67c..000000000 Binary files a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/56/52247b638d1516506790d6648b864ba3447f68 and /dev/null differ diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/56/6ddc4a6a06724993b2a55fec3f696c47b9dcce b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/56/6ddc4a6a06724993b2a55fec3f696c47b9dcce deleted file mode 100644 index 3aa0ef009..000000000 Binary files a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/56/6ddc4a6a06724993b2a55fec3f696c47b9dcce and /dev/null differ diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/5a/70ee314842fb5f46b452d16bc4d95e7154d4b4 b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/5a/70ee314842fb5f46b452d16bc4d95e7154d4b4 deleted file mode 100644 index 62afd0629..000000000 Binary files a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/5a/70ee314842fb5f46b452d16bc4d95e7154d4b4 and /dev/null differ diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 deleted file mode 100644 index 6a6f24362..000000000 Binary files a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 and /dev/null differ diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/65/e3f346ea03c8c2b0f1b8f6691abaed651fb77d b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/65/e3f346ea03c8c2b0f1b8f6691abaed651fb77d deleted file mode 100644 index 2d46f6c29..000000000 --- a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/65/e3f346ea03c8c2b0f1b8f6691abaed651fb77d +++ /dev/null @@ -1,3 +0,0 @@ -x -0E]+f/H("BWI2BӔo6TKhOmgNk#S$̈6Ā6OF; RDtS*q8N*2Ya:LM>UwF*—T -FzYj)E=s1+zwi^X/-6Av \ No newline at end of file diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/6b/8c369acb1897a5787e72b4c15d597d346f2b6a b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/6b/8c369acb1897a5787e72b4c15d597d346f2b6a deleted file mode 100644 index e0f637f62..000000000 --- a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/6b/8c369acb1897a5787e72b4c15d597d346f2b6a +++ /dev/null @@ -1,2 +0,0 @@ -xJ1a$Jjf5+R0{莨oo6>~8>ax*IcK6(PQUH*/wu 1bbRhIZϾZ86*WL%7D\X+FJJuqv8_|yo>_NIHh1\牡 -Op >z1Q \ No newline at end of file diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 deleted file mode 100644 index 2a1928079..000000000 Binary files a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/8e/b0f6c64dea2004a684ea55f9589b71b45d76a6 and /dev/null differ diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06d..000000000 Binary files a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c and /dev/null differ diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/a5/2c63287cda99fcc917438c34ac8f9c67274d79 b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/a5/2c63287cda99fcc917438c34ac8f9c67274d79 deleted file mode 100644 index 5edf24c6c..000000000 Binary files a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/a5/2c63287cda99fcc917438c34ac8f9c67274d79 and /dev/null differ diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a deleted file mode 100644 index ee4385f12..000000000 Binary files a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a and /dev/null differ diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/cb/66567aecbd1ceb7caebf1c3a3d16db28f4a54c b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/cb/66567aecbd1ceb7caebf1c3a3d16db28f4a54c deleted file mode 100644 index fa0541d87..000000000 Binary files a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/cb/66567aecbd1ceb7caebf1c3a3d16db28f4a54c and /dev/null differ diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/stashAllChanges/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/stashAllChanges/expected/repo/.git_keep/objects/df/9f3a300512205640e5ff10b624072a10afddde b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/df/9f3a300512205640e5ff10b624072a10afddde deleted file mode 100644 index ffb320769..000000000 --- a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/df/9f3a300512205640e5ff10b624072a10afddde +++ /dev/null @@ -1,3 +0,0 @@ -xϽJA`}ߞY.gNع=vGܴ꣠xk@iYm%SBEjk6+Dao,:>`lij4HӡP-QN5XjĘZ3Ҡ -* - ,ҢBp?c5]pn<1|CsW87m$O \ No newline at end of file diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/e4/13783635b9870fae2e48d6e6dccbdce5ddb3ff b/test/integration/stashAllChanges/expected/repo/.git_keep/objects/e4/13783635b9870fae2e48d6e6dccbdce5ddb3ff deleted file mode 100644 index cd8006b21..000000000 Binary files a/test/integration/stashAllChanges/expected/repo/.git_keep/objects/e4/13783635b9870fae2e48d6e6dccbdce5ddb3ff and /dev/null differ diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/refs/heads/master b/test/integration/stashAllChanges/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index b6b4a34f7..000000000 --- a/test/integration/stashAllChanges/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -cb66567aecbd1ceb7caebf1c3a3d16db28f4a54c diff --git a/test/integration/stashAllChanges/expected/repo/.git_keep/refs/stash b/test/integration/stashAllChanges/expected/repo/.git_keep/refs/stash deleted file mode 100644 index 1b28de6fe..000000000 --- a/test/integration/stashAllChanges/expected/repo/.git_keep/refs/stash +++ /dev/null @@ -1 +0,0 @@ -5a70ee314842fb5f46b452d16bc4d95e7154d4b4 diff --git a/test/integration/stashAllChanges/expected/repo/file0 b/test/integration/stashAllChanges/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/stashAllChanges/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/stashAllChanges/expected/repo/file1 b/test/integration/stashAllChanges/expected/repo/file1 deleted file mode 100644 index c7c7da3c6..000000000 --- a/test/integration/stashAllChanges/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -hello there diff --git a/test/integration/stashAllChanges/expected/repo/file2 b/test/integration/stashAllChanges/expected/repo/file2 deleted file mode 100644 index c7c7da3c6..000000000 --- a/test/integration/stashAllChanges/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -hello there diff --git a/test/integration/stashAllChanges/expected/repo/file3 b/test/integration/stashAllChanges/expected/repo/file3 deleted file mode 100644 index c7c7da3c6..000000000 --- a/test/integration/stashAllChanges/expected/repo/file3 +++ /dev/null @@ -1 +0,0 @@ -hello there diff --git a/test/integration/stashAllChanges/recording.json b/test/integration/stashAllChanges/recording.json deleted file mode 100644 index f9c8f1305..000000000 --- a/test/integration/stashAllChanges/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":1107,"Mod":0,"Key":256,"Ch":83},{"Timestamp":1736,"Mod":0,"Key":256,"Ch":97},{"Timestamp":2531,"Mod":0,"Key":256,"Ch":115},{"Timestamp":2623,"Mod":0,"Key":256,"Ch":116},{"Timestamp":2684,"Mod":0,"Key":256,"Ch":97},{"Timestamp":2784,"Mod":0,"Key":256,"Ch":115},{"Timestamp":3312,"Mod":0,"Key":256,"Ch":104},{"Timestamp":3400,"Mod":0,"Key":256,"Ch":32},{"Timestamp":3468,"Mod":0,"Key":256,"Ch":97},{"Timestamp":3583,"Mod":0,"Key":256,"Ch":108},{"Timestamp":3716,"Mod":0,"Key":256,"Ch":108},{"Timestamp":3913,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4284,"Mod":0,"Key":256,"Ch":108},{"Timestamp":4420,"Mod":0,"Key":256,"Ch":108},{"Timestamp":4707,"Mod":0,"Key":256,"Ch":108},{"Timestamp":5231,"Mod":0,"Key":256,"Ch":32},{"Timestamp":5940,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6733,"Mod":0,"Key":256,"Ch":50},{"Timestamp":7944,"Mod":0,"Key":256,"Ch":32},{"Timestamp":8694,"Mod":0,"Key":256,"Ch":83},{"Timestamp":9487,"Mod":0,"Key":256,"Ch":97},{"Timestamp":9952,"Mod":0,"Key":256,"Ch":115},{"Timestamp":10041,"Mod":0,"Key":256,"Ch":116},{"Timestamp":10092,"Mod":0,"Key":256,"Ch":97},{"Timestamp":10166,"Mod":0,"Key":256,"Ch":115},{"Timestamp":10253,"Mod":0,"Key":256,"Ch":104},{"Timestamp":10381,"Mod":0,"Key":256,"Ch":32},{"Timestamp":10610,"Mod":0,"Key":256,"Ch":110},{"Timestamp":10718,"Mod":0,"Key":256,"Ch":101},{"Timestamp":10869,"Mod":0,"Key":256,"Ch":119},{"Timestamp":10938,"Mod":0,"Key":256,"Ch":108},{"Timestamp":11071,"Mod":0,"Key":256,"Ch":121},{"Timestamp":11129,"Mod":0,"Key":256,"Ch":32},{"Timestamp":11279,"Mod":0,"Key":256,"Ch":116},{"Timestamp":11676,"Mod":0,"Key":256,"Ch":114},{"Timestamp":11753,"Mod":0,"Key":256,"Ch":97},{"Timestamp":11874,"Mod":0,"Key":256,"Ch":99},{"Timestamp":11984,"Mod":0,"Key":256,"Ch":107},{"Timestamp":12025,"Mod":0,"Key":256,"Ch":101},{"Timestamp":12125,"Mod":0,"Key":256,"Ch":100},{"Timestamp":12341,"Mod":0,"Key":13,"Ch":13},{"Timestamp":12925,"Mod":0,"Key":256,"Ch":53},{"Timestamp":14343,"Mod":0,"Key":256,"Ch":32},{"Timestamp":14871,"Mod":0,"Key":13,"Ch":13},{"Timestamp":15775,"Mod":0,"Key":256,"Ch":50},{"Timestamp":16168,"Mod":0,"Key":256,"Ch":106},{"Timestamp":16308,"Mod":0,"Key":256,"Ch":106},{"Timestamp":16515,"Mod":0,"Key":256,"Ch":32},{"Timestamp":16850,"Mod":0,"Key":256,"Ch":107},{"Timestamp":17159,"Mod":0,"Key":256,"Ch":32},{"Timestamp":18125,"Mod":0,"Key":256,"Ch":83},{"Timestamp":18639,"Mod":0,"Key":256,"Ch":97},{"Timestamp":18972,"Mod":0,"Key":256,"Ch":115},{"Timestamp":19060,"Mod":0,"Key":256,"Ch":116},{"Timestamp":19168,"Mod":0,"Key":256,"Ch":97},{"Timestamp":19236,"Mod":0,"Key":256,"Ch":115},{"Timestamp":19405,"Mod":0,"Key":256,"Ch":104},{"Timestamp":19593,"Mod":0,"Key":256,"Ch":32},{"Timestamp":19857,"Mod":0,"Key":256,"Ch":119},{"Timestamp":19942,"Mod":0,"Key":256,"Ch":105},{"Timestamp":20012,"Mod":0,"Key":256,"Ch":116},{"Timestamp":20072,"Mod":0,"Key":256,"Ch":104},{"Timestamp":20128,"Mod":0,"Key":256,"Ch":32},{"Timestamp":20188,"Mod":0,"Key":256,"Ch":115},{"Timestamp":20251,"Mod":0,"Key":256,"Ch":116},{"Timestamp":20335,"Mod":0,"Key":256,"Ch":97},{"Timestamp":20432,"Mod":0,"Key":256,"Ch":103},{"Timestamp":20471,"Mod":0,"Key":256,"Ch":101},{"Timestamp":20606,"Mod":0,"Key":256,"Ch":100},{"Timestamp":20789,"Mod":0,"Key":13,"Ch":13},{"Timestamp":21429,"Mod":0,"Key":256,"Ch":53},{"Timestamp":22402,"Mod":0,"Key":256,"Ch":32},{"Timestamp":23066,"Mod":0,"Key":13,"Ch":13},{"Timestamp":24259,"Mod":0,"Key":256,"Ch":104},{"Timestamp":24394,"Mod":0,"Key":256,"Ch":104},{"Timestamp":24532,"Mod":0,"Key":256,"Ch":104},{"Timestamp":24793,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":239,"Height":56}]} diff --git a/test/integration/stashAllChanges/setup.sh b/test/integration/stashAllChanges/setup.sh deleted file mode 100644 index caff56b7d..000000000 --- a/test/integration/stashAllChanges/setup.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -echo test0 > file0 -git add . -git commit -am file0 - -echo test1 > file1 -git add . -git commit -am file1 - -echo test2 > file2 -git add . -git commit -am file2 - -echo "hello there" > file1 -echo "hello there" > file2 -echo "hello there" > file3 diff --git a/test/integration/stashAllChanges/test.json b/test/integration/stashAllChanges/test.json deleted file mode 100644 index 645b63f7f..000000000 --- a/test/integration/stashAllChanges/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "Stashing all files", "speed": 5 } diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 6c493ff74..000000000 --- a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -file2 diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/FETCH_HEAD b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/HEAD b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/ORIG_HEAD b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 5f3d4ba83..000000000 --- a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -056328ba39d0418acd7270389b9d5f253b98aabf diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/config b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/config deleted file mode 100644 index 596ebaeb3..000000000 --- a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/description b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/stashAllChangesKeepIndex/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/stashAllChangesKeepIndex/expected/repo/.git_keep/index b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/index deleted file mode 100644 index 168c7d44f..000000000 Binary files a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/info/exclude b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/logs/HEAD b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 9861f89cf..000000000 --- a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 5c7a56ef74b1a692d67990b3f07a3af45a0e8f48 CI 1651830909 +0200 commit (initial): file0 -5c7a56ef74b1a692d67990b3f07a3af45a0e8f48 81f8f7653f26197f4f66641d6ab4ab99ac2a3391 CI 1651830909 +0200 commit: file1 -81f8f7653f26197f4f66641d6ab4ab99ac2a3391 056328ba39d0418acd7270389b9d5f253b98aabf CI 1651830909 +0200 commit: file2 -056328ba39d0418acd7270389b9d5f253b98aabf 056328ba39d0418acd7270389b9d5f253b98aabf CI 1651830915 +0200 reset: moving to HEAD diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 24c7e3201..000000000 --- a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 5c7a56ef74b1a692d67990b3f07a3af45a0e8f48 CI 1651830909 +0200 commit (initial): file0 -5c7a56ef74b1a692d67990b3f07a3af45a0e8f48 81f8f7653f26197f4f66641d6ab4ab99ac2a3391 CI 1651830909 +0200 commit: file1 -81f8f7653f26197f4f66641d6ab4ab99ac2a3391 056328ba39d0418acd7270389b9d5f253b98aabf CI 1651830909 +0200 commit: file2 diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/logs/refs/stash b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/logs/refs/stash deleted file mode 100644 index a7bbabb68..000000000 --- a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/logs/refs/stash +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 c87c87eb867338ed9956f6b28c8c3a83a1802c16 CI 1651830915 +0200 On master: keep index diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/05/6328ba39d0418acd7270389b9d5f253b98aabf b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/05/6328ba39d0418acd7270389b9d5f253b98aabf deleted file mode 100644 index 31a2717bd..000000000 --- a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/05/6328ba39d0418acd7270389b9d5f253b98aabf +++ /dev/null @@ -1,2 +0,0 @@ -xA - @Ѯ=BqDG(U1 & =~sn?o-$C&!jJX+fD# wJ9%.'0l/}[BK.٫CYϩ.r*h~9 \ No newline at end of file diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67..000000000 Binary files a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 and /dev/null differ diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d..000000000 Binary files a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da and /dev/null differ diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/5c/7a56ef74b1a692d67990b3f07a3af45a0e8f48 b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/5c/7a56ef74b1a692d67990b3f07a3af45a0e8f48 deleted file mode 100644 index 648edc330..000000000 Binary files a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/5c/7a56ef74b1a692d67990b3f07a3af45a0e8f48 and /dev/null differ diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 deleted file mode 100644 index 6a6f24362..000000000 Binary files a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 and /dev/null differ diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 deleted file mode 100644 index c84b87a17..000000000 --- a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 +++ /dev/null @@ -1,3 +0,0 @@ -x+)JMUd040031QHI5`ֶww.hT[H - e"ǨS,gu"YH -$x~5(;rբW-Ж+^ \ No newline at end of file diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/81/f8f7653f26197f4f66641d6ab4ab99ac2a3391 b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/81/f8f7653f26197f4f66641d6ab4ab99ac2a3391 deleted file mode 100644 index a3abc271d..000000000 Binary files a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/81/f8f7653f26197f4f66641d6ab4ab99ac2a3391 and /dev/null differ diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/99/bcc624e9c596901f0dd572be23ba5df84ec0d5 b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/99/bcc624e9c596901f0dd572be23ba5df84ec0d5 deleted file mode 100644 index 7e40c36bb..000000000 Binary files a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/99/bcc624e9c596901f0dd572be23ba5df84ec0d5 and /dev/null differ diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06d..000000000 Binary files a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c and /dev/null differ diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a deleted file mode 100644 index ee4385f12..000000000 Binary files a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a and /dev/null differ diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/c8/7c87eb867338ed9956f6b28c8c3a83a1802c16 b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/c8/7c87eb867338ed9956f6b28c8c3a83a1802c16 deleted file mode 100644 index 8b929b556..000000000 --- a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/c8/7c87eb867338ed9956f6b28c8c3a83a1802c16 +++ /dev/null @@ -1 +0,0 @@ -xAJ1a} RIg*8h6lܻ}|m'zPL{2ZiɉZ-1kCN sR5!sa)"yRkAđqT)b>!myJ^.7K?\$#xDuOo{g4;ඩRN+ \ No newline at end of file diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/stashAllChangesKeepIndex/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/stashAllChangesKeepIndex/expected/repo/.git_keep/refs/heads/master b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 5f3d4ba83..000000000 --- a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -056328ba39d0418acd7270389b9d5f253b98aabf diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/refs/stash b/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/refs/stash deleted file mode 100644 index 4a3424d55..000000000 --- a/test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/refs/stash +++ /dev/null @@ -1 +0,0 @@ -c87c87eb867338ed9956f6b28c8c3a83a1802c16 diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/file0 b/test/integration/stashAllChangesKeepIndex/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/stashAllChangesKeepIndex/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/file1 b/test/integration/stashAllChangesKeepIndex/expected/repo/file1 deleted file mode 100644 index c7c7da3c6..000000000 --- a/test/integration/stashAllChangesKeepIndex/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -hello there diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/file2 b/test/integration/stashAllChangesKeepIndex/expected/repo/file2 deleted file mode 100644 index c7c7da3c6..000000000 --- a/test/integration/stashAllChangesKeepIndex/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -hello there diff --git a/test/integration/stashAllChangesKeepIndex/expected/repo/file3 b/test/integration/stashAllChangesKeepIndex/expected/repo/file3 deleted file mode 100644 index c7c7da3c6..000000000 --- a/test/integration/stashAllChangesKeepIndex/expected/repo/file3 +++ /dev/null @@ -1 +0,0 @@ -hello there diff --git a/test/integration/stashAllChangesKeepIndex/recording.json b/test/integration/stashAllChangesKeepIndex/recording.json deleted file mode 100644 index f9ae3f103..000000000 --- a/test/integration/stashAllChangesKeepIndex/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":1343,"Mod":0,"Key":256,"Ch":32},{"Timestamp":1895,"Mod":0,"Key":256,"Ch":83},{"Timestamp":3116,"Mod":0,"Key":256,"Ch":105},{"Timestamp":4389,"Mod":0,"Key":256,"Ch":107},{"Timestamp":4458,"Mod":0,"Key":256,"Ch":101},{"Timestamp":4571,"Mod":0,"Key":256,"Ch":101},{"Timestamp":4656,"Mod":0,"Key":256,"Ch":112},{"Timestamp":4742,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4834,"Mod":0,"Key":256,"Ch":105},{"Timestamp":4908,"Mod":0,"Key":256,"Ch":110},{"Timestamp":4965,"Mod":0,"Key":256,"Ch":100},{"Timestamp":5013,"Mod":0,"Key":256,"Ch":101},{"Timestamp":5162,"Mod":0,"Key":256,"Ch":120},{"Timestamp":5500,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6822,"Mod":0,"Key":256,"Ch":53},{"Timestamp":8093,"Mod":0,"Key":256,"Ch":32},{"Timestamp":8985,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9950,"Mod":0,"Key":256,"Ch":49},{"Timestamp":10588,"Mod":0,"Key":256,"Ch":106},{"Timestamp":11171,"Mod":0,"Key":256,"Ch":50},{"Timestamp":11581,"Mod":0,"Key":256,"Ch":32},{"Timestamp":12392,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":239,"Height":56}]} diff --git a/test/integration/stashAllChangesKeepIndex/setup.sh b/test/integration/stashAllChangesKeepIndex/setup.sh deleted file mode 100644 index caff56b7d..000000000 --- a/test/integration/stashAllChangesKeepIndex/setup.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -echo test0 > file0 -git add . -git commit -am file0 - -echo test1 > file1 -git add . -git commit -am file1 - -echo test2 > file2 -git add . -git commit -am file2 - -echo "hello there" > file1 -echo "hello there" > file2 -echo "hello there" > file3 diff --git a/test/integration/stashAllChangesKeepIndex/test.json b/test/integration/stashAllChangesKeepIndex/test.json deleted file mode 100644 index 4f9314caa..000000000 --- a/test/integration/stashAllChangesKeepIndex/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "Stashing some files", "speed": 5 } diff --git a/test/integration/stashDrop/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/stashDrop/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 6c493ff74..000000000 --- a/test/integration/stashDrop/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -file2 diff --git a/test/integration/stashDrop/expected/repo/.git_keep/FETCH_HEAD b/test/integration/stashDrop/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/stashDrop/expected/repo/.git_keep/HEAD b/test/integration/stashDrop/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/stashDrop/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/stashDrop/expected/repo/.git_keep/ORIG_HEAD b/test/integration/stashDrop/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 11345d776..000000000 --- a/test/integration/stashDrop/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -91a35446b7de806c46cd84a8574b2302443a5868 diff --git a/test/integration/stashDrop/expected/repo/.git_keep/config b/test/integration/stashDrop/expected/repo/.git_keep/config deleted file mode 100644 index 596ebaeb3..000000000 --- a/test/integration/stashDrop/expected/repo/.git_keep/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/stashDrop/expected/repo/.git_keep/description b/test/integration/stashDrop/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/stashDrop/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/stashDrop/expected/repo/.git_keep/index b/test/integration/stashDrop/expected/repo/.git_keep/index deleted file mode 100644 index a201208c8..000000000 Binary files a/test/integration/stashDrop/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/stashDrop/expected/repo/.git_keep/info/exclude b/test/integration/stashDrop/expected/repo/.git_keep/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/test/integration/stashDrop/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/test/integration/stashDrop/expected/repo/.git_keep/logs/HEAD b/test/integration/stashDrop/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index b3b2d9888..000000000 --- a/test/integration/stashDrop/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 bea28eaac7bdaf99371daf5b9a788061a12308f4 CI 1650270506 +0200 commit (initial): file0 -bea28eaac7bdaf99371daf5b9a788061a12308f4 0e84352ca8531152e477715812e6e275d986984e CI 1650270506 +0200 commit: file1 -0e84352ca8531152e477715812e6e275d986984e 91a35446b7de806c46cd84a8574b2302443a5868 CI 1650270506 +0200 commit: file2 -91a35446b7de806c46cd84a8574b2302443a5868 91a35446b7de806c46cd84a8574b2302443a5868 CI 1650270506 +0200 reset: moving to HEAD diff --git a/test/integration/stashDrop/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/stashDrop/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 06a7a9d1d..000000000 --- a/test/integration/stashDrop/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 bea28eaac7bdaf99371daf5b9a788061a12308f4 CI 1650270506 +0200 commit (initial): file0 -bea28eaac7bdaf99371daf5b9a788061a12308f4 0e84352ca8531152e477715812e6e275d986984e CI 1650270506 +0200 commit: file1 -0e84352ca8531152e477715812e6e275d986984e 91a35446b7de806c46cd84a8574b2302443a5868 CI 1650270506 +0200 commit: file2 diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/0e/84352ca8531152e477715812e6e275d986984e b/test/integration/stashDrop/expected/repo/.git_keep/objects/0e/84352ca8531152e477715812e6e275d986984e deleted file mode 100644 index ad8496326..000000000 --- a/test/integration/stashDrop/expected/repo/.git_keep/objects/0e/84352ca8531152e477715812e6e275d986984e +++ /dev/null @@ -1,3 +0,0 @@ -xM -0F] 2πU1LR"x|sW<ރm[6h/RdFf@b"[]lahՉu=:wEf!T*5DPR }k?44?K۱ʍM ` -@ :NuSWmYŨ/:2 \ No newline at end of file diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/stashDrop/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/stashDrop/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/stashDrop/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67..000000000 Binary files a/test/integration/stashDrop/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 and /dev/null differ diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/stashDrop/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d..000000000 Binary files a/test/integration/stashDrop/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da and /dev/null differ diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/5a/0e5672e3ccb264c401de9b84957c53138cd32c b/test/integration/stashDrop/expected/repo/.git_keep/objects/5a/0e5672e3ccb264c401de9b84957c53138cd32c deleted file mode 100644 index 08f8bb690..000000000 Binary files a/test/integration/stashDrop/expected/repo/.git_keep/objects/5a/0e5672e3ccb264c401de9b84957c53138cd32c and /dev/null differ diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 b/test/integration/stashDrop/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 deleted file mode 100644 index 6a6f24362..000000000 Binary files a/test/integration/stashDrop/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 and /dev/null differ diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/75/a47f9be3d041530e975683cde13a62ddc65007 b/test/integration/stashDrop/expected/repo/.git_keep/objects/75/a47f9be3d041530e975683cde13a62ddc65007 deleted file mode 100644 index e3f498c19..000000000 --- a/test/integration/stashDrop/expected/repo/.git_keep/objects/75/a47f9be3d041530e975683cde13a62ddc65007 +++ /dev/null @@ -1,2 +0,0 @@ -x=j1 @s - ے[m3Ȳ aƁ?ӤO ̀"IZ.klI314bZ618 Lkj1*Em$sz c,hZ}$%tJT8)uy;\ozۏ^t7p'dq991|x@8w>_*+M \ No newline at end of file diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/91/a35446b7de806c46cd84a8574b2302443a5868 b/test/integration/stashDrop/expected/repo/.git_keep/objects/91/a35446b7de806c46cd84a8574b2302443a5868 deleted file mode 100644 index a216ac57d..000000000 Binary files a/test/integration/stashDrop/expected/repo/.git_keep/objects/91/a35446b7de806c46cd84a8574b2302443a5868 and /dev/null differ diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/stashDrop/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06d..000000000 Binary files a/test/integration/stashDrop/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c and /dev/null differ diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/stashDrop/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/stashDrop/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/be/a28eaac7bdaf99371daf5b9a788061a12308f4 b/test/integration/stashDrop/expected/repo/.git_keep/objects/be/a28eaac7bdaf99371daf5b9a788061a12308f4 deleted file mode 100644 index 3ed6793af..000000000 Binary files a/test/integration/stashDrop/expected/repo/.git_keep/objects/be/a28eaac7bdaf99371daf5b9a788061a12308f4 and /dev/null differ diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a b/test/integration/stashDrop/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a deleted file mode 100644 index ee4385f12..000000000 Binary files a/test/integration/stashDrop/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a and /dev/null differ diff --git a/test/integration/stashDrop/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/stashDrop/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/stashDrop/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/stashDrop/expected/repo/.git_keep/refs/heads/master b/test/integration/stashDrop/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 11345d776..000000000 --- a/test/integration/stashDrop/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -91a35446b7de806c46cd84a8574b2302443a5868 diff --git a/test/integration/stashDrop/expected/repo/file0 b/test/integration/stashDrop/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/stashDrop/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/stashDrop/expected/repo/file1 b/test/integration/stashDrop/expected/repo/file1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/stashDrop/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/stashDrop/expected/repo/file2 b/test/integration/stashDrop/expected/repo/file2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/stashDrop/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/stashDrop/expected/repo/file3 b/test/integration/stashDrop/expected/repo/file3 deleted file mode 100644 index c7c7da3c6..000000000 --- a/test/integration/stashDrop/expected/repo/file3 +++ /dev/null @@ -1 +0,0 @@ -hello there diff --git a/test/integration/stashDrop/recording.json b/test/integration/stashDrop/recording.json deleted file mode 100644 index b3aa3e738..000000000 --- a/test/integration/stashDrop/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":767,"Mod":0,"Key":256,"Ch":53},{"Timestamp":1706,"Mod":0,"Key":256,"Ch":100},{"Timestamp":2841,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3906,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":239,"Height":55}]} \ No newline at end of file diff --git a/test/integration/stashDrop/setup.sh b/test/integration/stashDrop/setup.sh deleted file mode 100644 index 2278d53d8..000000000 --- a/test/integration/stashDrop/setup.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -echo test0 > file0 -git add . -git commit -am file0 - -echo test1 > file1 -git add . -git commit -am file1 - -echo test2 > file2 -git add . -git commit -am file2 - -echo "hello there" > file1 -echo "hello there" > file2 -echo "hello there" > file3 - -git stash save "stash to drop" diff --git a/test/integration/stashDrop/test.json b/test/integration/stashDrop/test.json deleted file mode 100644 index 7cb436f8f..000000000 --- a/test/integration/stashDrop/test.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "description": "Stashing some files", - "speed": 20 -} diff --git a/test/integration/stashNewBranch/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/stashNewBranch/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 6c493ff74..000000000 --- a/test/integration/stashNewBranch/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -file2 diff --git a/test/integration/stashNewBranch/expected/repo/.git_keep/FETCH_HEAD b/test/integration/stashNewBranch/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/stashNewBranch/expected/repo/.git_keep/HEAD b/test/integration/stashNewBranch/expected/repo/.git_keep/HEAD deleted file mode 100644 index fe9f8c059..000000000 --- a/test/integration/stashNewBranch/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/hello diff --git a/test/integration/stashNewBranch/expected/repo/.git_keep/ORIG_HEAD b/test/integration/stashNewBranch/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index e9ec35d50..000000000 --- a/test/integration/stashNewBranch/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -2ab31642272ef6607700326d4ddb78f35e609d2b diff --git a/test/integration/stashNewBranch/expected/repo/.git_keep/config b/test/integration/stashNewBranch/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/stashNewBranch/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/stashNewBranch/expected/repo/.git_keep/description b/test/integration/stashNewBranch/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/stashNewBranch/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/stashNewBranch/expected/repo/.git_keep/index b/test/integration/stashNewBranch/expected/repo/.git_keep/index deleted file mode 100644 index 7d5c3c25b..000000000 Binary files a/test/integration/stashNewBranch/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/stashNewBranch/expected/repo/.git_keep/info/exclude b/test/integration/stashNewBranch/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/stashNewBranch/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/stashNewBranch/expected/repo/.git_keep/logs/HEAD b/test/integration/stashNewBranch/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 369c0b7da..000000000 --- a/test/integration/stashNewBranch/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 797c030ec107d77fa39a1e453ad620235cb26725 CI 1617674783 +1000 commit (initial): file0 -797c030ec107d77fa39a1e453ad620235cb26725 5b9d4ea51af3db649ff3ae4d92b9eacb84218368 CI 1617674783 +1000 commit: file1 -5b9d4ea51af3db649ff3ae4d92b9eacb84218368 2ab31642272ef6607700326d4ddb78f35e609d2b CI 1617674783 +1000 commit: file2 -2ab31642272ef6607700326d4ddb78f35e609d2b 2ab31642272ef6607700326d4ddb78f35e609d2b CI 1617674785 +1000 reset: moving to HEAD -2ab31642272ef6607700326d4ddb78f35e609d2b 71890c9b458697fbb4a6a9dde41614bea569aac8 CI 1617674788 +1000 checkout: moving from master to hello diff --git a/test/integration/stashNewBranch/expected/repo/.git_keep/logs/refs/heads/hello b/test/integration/stashNewBranch/expected/repo/.git_keep/logs/refs/heads/hello deleted file mode 100644 index de5f2720f..000000000 --- a/test/integration/stashNewBranch/expected/repo/.git_keep/logs/refs/heads/hello +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 71890c9b458697fbb4a6a9dde41614bea569aac8 CI 1617674788 +1000 branch: Created from stash@{0} diff --git a/test/integration/stashNewBranch/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/stashNewBranch/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 06ab45c96..000000000 --- a/test/integration/stashNewBranch/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 797c030ec107d77fa39a1e453ad620235cb26725 CI 1617674783 +1000 commit (initial): file0 -797c030ec107d77fa39a1e453ad620235cb26725 5b9d4ea51af3db649ff3ae4d92b9eacb84218368 CI 1617674783 +1000 commit: file1 -5b9d4ea51af3db649ff3ae4d92b9eacb84218368 2ab31642272ef6607700326d4ddb78f35e609d2b CI 1617674783 +1000 commit: file2 diff --git a/test/integration/stashNewBranch/expected/repo/.git_keep/logs/refs/stash b/test/integration/stashNewBranch/expected/repo/.git_keep/logs/refs/stash deleted file mode 100644 index fb87f7c50..000000000 --- a/test/integration/stashNewBranch/expected/repo/.git_keep/logs/refs/stash +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 71890c9b458697fbb4a6a9dde41614bea569aac8 CI 1617674785 +1000 On master: asd diff --git a/test/integration/stashNewBranch/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/stashNewBranch/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/stashNewBranch/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/stashNewBranch/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/stashNewBranch/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67..000000000 Binary files a/test/integration/stashNewBranch/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 and /dev/null differ diff --git a/test/integration/stashNewBranch/expected/repo/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da b/test/integration/stashNewBranch/expected/repo/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da deleted file mode 100644 index ea6cd3866..000000000 Binary files a/test/integration/stashNewBranch/expected/repo/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da and /dev/null differ diff --git a/test/integration/stashNewBranch/expected/repo/.git_keep/objects/2a/b31642272ef6607700326d4ddb78f35e609d2b b/test/integration/stashNewBranch/expected/repo/.git_keep/objects/2a/b31642272ef6607700326d4ddb78f35e609d2b deleted file mode 100644 index cfc4b63ec..000000000 Binary files a/test/integration/stashNewBranch/expected/repo/.git_keep/objects/2a/b31642272ef6607700326d4ddb78f35e609d2b and /dev/null differ diff --git a/test/integration/stashNewBranch/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/stashNewBranch/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d..000000000 Binary files a/test/integration/stashNewBranch/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da and /dev/null differ diff --git a/test/integration/stashNewBranch/expected/repo/.git_keep/objects/5b/9d4ea51af3db649ff3ae4d92b9eacb84218368 b/test/integration/stashNewBranch/expected/repo/.git_keep/objects/5b/9d4ea51af3db649ff3ae4d92b9eacb84218368 deleted file mode 100644 index ebaaf1061..000000000 Binary files a/test/integration/stashNewBranch/expected/repo/.git_keep/objects/5b/9d4ea51af3db649ff3ae4d92b9eacb84218368 and /dev/null differ diff --git a/test/integration/stashNewBranch/expected/repo/.git_keep/objects/71/890c9b458697fbb4a6a9dde41614bea569aac8 b/test/integration/stashNewBranch/expected/repo/.git_keep/objects/71/890c9b458697fbb4a6a9dde41614bea569aac8 deleted file mode 100644 index 74401c735..000000000 --- a/test/integration/stashNewBranch/expected/repo/.git_keep/objects/71/890c9b458697fbb4a6a9dde41614bea569aac8 +++ /dev/null @@ -1,2 +0,0 @@ -x1N1 E鑐$vBi8{Y'm#`eM9 -Rs6,XI$tjK2"D ,5k*N hm~t+KR!D4| ˫}SK8s-qL:OO}y韂II \ No newline at end of file diff --git a/test/integration/stashNewBranch/expected/repo/.git_keep/objects/79/7c030ec107d77fa39a1e453ad620235cb26725 b/test/integration/stashNewBranch/expected/repo/.git_keep/objects/79/7c030ec107d77fa39a1e453ad620235cb26725 deleted file mode 100644 index 0b19e2873..000000000 Binary files a/test/integration/stashNewBranch/expected/repo/.git_keep/objects/79/7c030ec107d77fa39a1e453ad620235cb26725 and /dev/null differ diff --git a/test/integration/stashNewBranch/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/stashNewBranch/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06d..000000000 Binary files a/test/integration/stashNewBranch/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c and /dev/null differ diff --git a/test/integration/stashNewBranch/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/stashNewBranch/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/stashNewBranch/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/stashNewBranch/expected/repo/.git_keep/objects/ac/b6fb50a77cf7bb6fb9cd5e45bc98010012d7c6 b/test/integration/stashNewBranch/expected/repo/.git_keep/objects/ac/b6fb50a77cf7bb6fb9cd5e45bc98010012d7c6 deleted file mode 100644 index 2e44cbb78..000000000 Binary files a/test/integration/stashNewBranch/expected/repo/.git_keep/objects/ac/b6fb50a77cf7bb6fb9cd5e45bc98010012d7c6 and /dev/null differ diff --git a/test/integration/stashNewBranch/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a b/test/integration/stashNewBranch/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a deleted file mode 100644 index ee4385f12..000000000 Binary files a/test/integration/stashNewBranch/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a and /dev/null differ diff --git a/test/integration/stashNewBranch/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/stashNewBranch/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/stashNewBranch/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/stashNewBranch/expected/repo/.git_keep/refs/heads/hello b/test/integration/stashNewBranch/expected/repo/.git_keep/refs/heads/hello deleted file mode 100644 index abd2f9527..000000000 --- a/test/integration/stashNewBranch/expected/repo/.git_keep/refs/heads/hello +++ /dev/null @@ -1 +0,0 @@ -71890c9b458697fbb4a6a9dde41614bea569aac8 diff --git a/test/integration/stashNewBranch/expected/repo/.git_keep/refs/heads/master b/test/integration/stashNewBranch/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index e9ec35d50..000000000 --- a/test/integration/stashNewBranch/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -2ab31642272ef6607700326d4ddb78f35e609d2b diff --git a/test/integration/stashNewBranch/expected/repo/.git_keep/refs/stash b/test/integration/stashNewBranch/expected/repo/.git_keep/refs/stash deleted file mode 100644 index abd2f9527..000000000 --- a/test/integration/stashNewBranch/expected/repo/.git_keep/refs/stash +++ /dev/null @@ -1 +0,0 @@ -71890c9b458697fbb4a6a9dde41614bea569aac8 diff --git a/test/integration/stashNewBranch/expected/repo/file0 b/test/integration/stashNewBranch/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/stashNewBranch/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/stashNewBranch/expected/repo/file1 b/test/integration/stashNewBranch/expected/repo/file1 deleted file mode 100644 index c7c7da3c6..000000000 --- a/test/integration/stashNewBranch/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -hello there diff --git a/test/integration/stashNewBranch/expected/repo/file2 b/test/integration/stashNewBranch/expected/repo/file2 deleted file mode 100644 index c7c7da3c6..000000000 --- a/test/integration/stashNewBranch/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -hello there diff --git a/test/integration/stashNewBranch/expected/repo/file3 b/test/integration/stashNewBranch/expected/repo/file3 deleted file mode 100644 index c7c7da3c6..000000000 --- a/test/integration/stashNewBranch/expected/repo/file3 +++ /dev/null @@ -1 +0,0 @@ -hello there diff --git a/test/integration/stashNewBranch/recording.json b/test/integration/stashNewBranch/recording.json deleted file mode 100644 index 945677525..000000000 --- a/test/integration/stashNewBranch/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":451,"Mod":0,"Key":256,"Ch":97},{"Timestamp":980,"Mod":0,"Key":256,"Ch":115},{"Timestamp":1236,"Mod":0,"Key":256,"Ch":97},{"Timestamp":1324,"Mod":0,"Key":256,"Ch":115},{"Timestamp":1404,"Mod":0,"Key":256,"Ch":100},{"Timestamp":1668,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2109,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2420,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2748,"Mod":0,"Key":259,"Ch":0},{"Timestamp":4036,"Mod":0,"Key":256,"Ch":110},{"Timestamp":4332,"Mod":0,"Key":256,"Ch":104},{"Timestamp":4452,"Mod":0,"Key":256,"Ch":101},{"Timestamp":4580,"Mod":0,"Key":256,"Ch":108},{"Timestamp":4700,"Mod":0,"Key":256,"Ch":108},{"Timestamp":4836,"Mod":0,"Key":256,"Ch":111},{"Timestamp":5084,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5964,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/stashNewBranch/setup.sh b/test/integration/stashNewBranch/setup.sh deleted file mode 100644 index caff56b7d..000000000 --- a/test/integration/stashNewBranch/setup.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -echo test0 > file0 -git add . -git commit -am file0 - -echo test1 > file1 -git add . -git commit -am file1 - -echo test2 > file2 -git add . -git commit -am file2 - -echo "hello there" > file1 -echo "hello there" > file2 -echo "hello there" > file3 diff --git a/test/integration/stashNewBranch/test.json b/test/integration/stashNewBranch/test.json deleted file mode 100644 index ac2d98f0a..000000000 --- a/test/integration/stashNewBranch/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "Creating a new branch from a stash entry", "speed": 5 } diff --git a/test/integration/stashPop/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/stashPop/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 6c493ff74..000000000 --- a/test/integration/stashPop/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -file2 diff --git a/test/integration/stashPop/expected/repo/.git_keep/FETCH_HEAD b/test/integration/stashPop/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/stashPop/expected/repo/.git_keep/HEAD b/test/integration/stashPop/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/stashPop/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/stashPop/expected/repo/.git_keep/ORIG_HEAD b/test/integration/stashPop/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 3823b7b86..000000000 --- a/test/integration/stashPop/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -f9bd523df842e6b52de8880c366f7d15d6bab650 diff --git a/test/integration/stashPop/expected/repo/.git_keep/config b/test/integration/stashPop/expected/repo/.git_keep/config deleted file mode 100644 index 596ebaeb3..000000000 --- a/test/integration/stashPop/expected/repo/.git_keep/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/stashPop/expected/repo/.git_keep/description b/test/integration/stashPop/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/stashPop/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/stashPop/expected/repo/.git_keep/index b/test/integration/stashPop/expected/repo/.git_keep/index deleted file mode 100644 index 667aead25..000000000 Binary files a/test/integration/stashPop/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/stashPop/expected/repo/.git_keep/info/exclude b/test/integration/stashPop/expected/repo/.git_keep/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/test/integration/stashPop/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/test/integration/stashPop/expected/repo/.git_keep/logs/HEAD b/test/integration/stashPop/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index f205db06f..000000000 --- a/test/integration/stashPop/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 4a80cc4f1537d7ce4f184f346c9ba7c51bb34aee CI 1650270548 +0200 commit (initial): file0 -4a80cc4f1537d7ce4f184f346c9ba7c51bb34aee f26e5e813038fe0c31c4733d57fcf93758736e71 CI 1650270548 +0200 commit: file1 -f26e5e813038fe0c31c4733d57fcf93758736e71 f9bd523df842e6b52de8880c366f7d15d6bab650 CI 1650270548 +0200 commit: file2 -f9bd523df842e6b52de8880c366f7d15d6bab650 f9bd523df842e6b52de8880c366f7d15d6bab650 CI 1650270548 +0200 reset: moving to HEAD diff --git a/test/integration/stashPop/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/stashPop/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index f3893791a..000000000 --- a/test/integration/stashPop/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 4a80cc4f1537d7ce4f184f346c9ba7c51bb34aee CI 1650270548 +0200 commit (initial): file0 -4a80cc4f1537d7ce4f184f346c9ba7c51bb34aee f26e5e813038fe0c31c4733d57fcf93758736e71 CI 1650270548 +0200 commit: file1 -f26e5e813038fe0c31c4733d57fcf93758736e71 f9bd523df842e6b52de8880c366f7d15d6bab650 CI 1650270548 +0200 commit: file2 diff --git a/test/integration/stashPop/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/stashPop/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/stashPop/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/stashPop/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/stashPop/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67..000000000 Binary files a/test/integration/stashPop/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 and /dev/null differ diff --git a/test/integration/stashPop/expected/repo/.git_keep/objects/2d/79a3b4f905a83d994f860d3d91625fab899422 b/test/integration/stashPop/expected/repo/.git_keep/objects/2d/79a3b4f905a83d994f860d3d91625fab899422 deleted file mode 100644 index 947808f26..000000000 --- a/test/integration/stashPop/expected/repo/.git_keep/objects/2d/79a3b4f905a83d994f860d3d91625fab899422 +++ /dev/null @@ -1 +0,0 @@ -xJ1a$aV**F0;o6>m9C~&ZH"Ĺh jjtlդmCTXG5 K4&cUiIW5=/ӌ$Ziy\ozK^o`&|glk]Sɷt:9=P6 \ No newline at end of file diff --git a/test/integration/stashPop/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/stashPop/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d..000000000 Binary files a/test/integration/stashPop/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da and /dev/null differ diff --git a/test/integration/stashPop/expected/repo/.git_keep/objects/42/ffa95ec8ce68b4bf04d4dab6c03283e61f4bda b/test/integration/stashPop/expected/repo/.git_keep/objects/42/ffa95ec8ce68b4bf04d4dab6c03283e61f4bda deleted file mode 100644 index 425c6c04d..000000000 --- a/test/integration/stashPop/expected/repo/.git_keep/objects/42/ffa95ec8ce68b4bf04d4dab6c03283e61f4bda +++ /dev/null @@ -1,3 +0,0 @@ -x -0D=+.HmUDIv-5B?\{72U@Ou92c1;ɞa&] -bǙz-r; :gc*|ka>O9Bf<=Y֪Mʟs5-, ngy8Bj \ No newline at end of file diff --git a/test/integration/stashPop/expected/repo/.git_keep/objects/4a/80cc4f1537d7ce4f184f346c9ba7c51bb34aee b/test/integration/stashPop/expected/repo/.git_keep/objects/4a/80cc4f1537d7ce4f184f346c9ba7c51bb34aee deleted file mode 100644 index 6f2666e32..000000000 --- a/test/integration/stashPop/expected/repo/.git_keep/objects/4a/80cc4f1537d7ce4f184f346c9ba7c51bb34aee +++ /dev/null @@ -1,2 +0,0 @@ -xA - F= eF(U"`!oヷZNZ4p>rֻ5C*Rؤ\LALi~uXZI;ƳlUIǟ\ul+ \ No newline at end of file diff --git a/test/integration/stashPop/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 b/test/integration/stashPop/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 deleted file mode 100644 index 6a6f24362..000000000 Binary files a/test/integration/stashPop/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 and /dev/null differ diff --git a/test/integration/stashPop/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/stashPop/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06d..000000000 Binary files a/test/integration/stashPop/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c and /dev/null differ diff --git a/test/integration/stashPop/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/stashPop/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/stashPop/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/stashPop/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a b/test/integration/stashPop/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a deleted file mode 100644 index ee4385f12..000000000 Binary files a/test/integration/stashPop/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a and /dev/null differ diff --git a/test/integration/stashPop/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/stashPop/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/stashPop/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/stashPop/expected/repo/.git_keep/objects/f2/6e5e813038fe0c31c4733d57fcf93758736e71 b/test/integration/stashPop/expected/repo/.git_keep/objects/f2/6e5e813038fe0c31c4733d57fcf93758736e71 deleted file mode 100644 index 9934ea2ee..000000000 Binary files a/test/integration/stashPop/expected/repo/.git_keep/objects/f2/6e5e813038fe0c31c4733d57fcf93758736e71 and /dev/null differ diff --git a/test/integration/stashPop/expected/repo/.git_keep/objects/f9/bd523df842e6b52de8880c366f7d15d6bab650 b/test/integration/stashPop/expected/repo/.git_keep/objects/f9/bd523df842e6b52de8880c366f7d15d6bab650 deleted file mode 100644 index c48bcf855..000000000 --- a/test/integration/stashPop/expected/repo/.git_keep/objects/f9/bd523df842e6b52de8880c366f7d15d6bab650 +++ /dev/null @@ -1,2 +0,0 @@ -x1 -0 @>BRBÑeH\#t붮sK;|o"R0שU "H=nbhHRЎJ䪵'”˟?>Ou_!E@؉S΋9y \ No newline at end of file diff --git a/test/integration/stashPop/expected/repo/.git_keep/refs/heads/master b/test/integration/stashPop/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 3823b7b86..000000000 --- a/test/integration/stashPop/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -f9bd523df842e6b52de8880c366f7d15d6bab650 diff --git a/test/integration/stashPop/expected/repo/file0 b/test/integration/stashPop/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/stashPop/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/stashPop/expected/repo/file1 b/test/integration/stashPop/expected/repo/file1 deleted file mode 100644 index c7c7da3c6..000000000 --- a/test/integration/stashPop/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -hello there diff --git a/test/integration/stashPop/expected/repo/file2 b/test/integration/stashPop/expected/repo/file2 deleted file mode 100644 index c7c7da3c6..000000000 --- a/test/integration/stashPop/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -hello there diff --git a/test/integration/stashPop/expected/repo/file3 b/test/integration/stashPop/expected/repo/file3 deleted file mode 100644 index c7c7da3c6..000000000 --- a/test/integration/stashPop/expected/repo/file3 +++ /dev/null @@ -1 +0,0 @@ -hello there diff --git a/test/integration/stashPop/recording.json b/test/integration/stashPop/recording.json deleted file mode 100644 index 272f83875..000000000 --- a/test/integration/stashPop/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":658,"Mod":0,"Key":256,"Ch":53},{"Timestamp":1387,"Mod":0,"Key":256,"Ch":103},{"Timestamp":2364,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3446,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":239,"Height":55}]} \ No newline at end of file diff --git a/test/integration/stashPop/setup.sh b/test/integration/stashPop/setup.sh deleted file mode 100644 index 2278d53d8..000000000 --- a/test/integration/stashPop/setup.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -echo test0 > file0 -git add . -git commit -am file0 - -echo test1 > file1 -git add . -git commit -am file1 - -echo test2 > file2 -git add . -git commit -am file2 - -echo "hello there" > file1 -echo "hello there" > file2 -echo "hello there" > file3 - -git stash save "stash to drop" diff --git a/test/integration/stashPop/test.json b/test/integration/stashPop/test.json deleted file mode 100644 index 7cb436f8f..000000000 --- a/test/integration/stashPop/test.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "description": "Stashing some files", - "speed": 20 -} diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/stashStagedChanges/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 6c493ff74..000000000 --- a/test/integration/stashStagedChanges/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -file2 diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/FETCH_HEAD b/test/integration/stashStagedChanges/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/HEAD b/test/integration/stashStagedChanges/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/stashStagedChanges/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/ORIG_HEAD b/test/integration/stashStagedChanges/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 218f6a270..000000000 --- a/test/integration/stashStagedChanges/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -b71c3131aa943097c697d5194d0f4de01f82b743 diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/config b/test/integration/stashStagedChanges/expected/repo/.git_keep/config deleted file mode 100644 index 596ebaeb3..000000000 --- a/test/integration/stashStagedChanges/expected/repo/.git_keep/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/description b/test/integration/stashStagedChanges/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/stashStagedChanges/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/stashStagedChanges/expected/repo/.git_keep/index b/test/integration/stashStagedChanges/expected/repo/.git_keep/index deleted file mode 100644 index 09e14a6d2..000000000 Binary files a/test/integration/stashStagedChanges/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/info/exclude b/test/integration/stashStagedChanges/expected/repo/.git_keep/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/test/integration/stashStagedChanges/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/logs/HEAD b/test/integration/stashStagedChanges/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 4df45bbb4..000000000 --- a/test/integration/stashStagedChanges/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 6cd167c43cd50ae47f776f182ed6ff0b0a4471e3 CI 1651831365 +0200 commit (initial): file0 -6cd167c43cd50ae47f776f182ed6ff0b0a4471e3 29d32b3857eab1a570b9fc534dd90b9876c5cd1a CI 1651831365 +0200 commit: file1 -29d32b3857eab1a570b9fc534dd90b9876c5cd1a b71c3131aa943097c697d5194d0f4de01f82b743 CI 1651831365 +0200 commit: file2 -b71c3131aa943097c697d5194d0f4de01f82b743 b71c3131aa943097c697d5194d0f4de01f82b743 CI 1651831372 +0200 reset: moving to HEAD -b71c3131aa943097c697d5194d0f4de01f82b743 b71c3131aa943097c697d5194d0f4de01f82b743 CI 1651831372 +0200 reset: moving to HEAD diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/stashStagedChanges/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 106c3646d..000000000 --- a/test/integration/stashStagedChanges/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 6cd167c43cd50ae47f776f182ed6ff0b0a4471e3 CI 1651831365 +0200 commit (initial): file0 -6cd167c43cd50ae47f776f182ed6ff0b0a4471e3 29d32b3857eab1a570b9fc534dd90b9876c5cd1a CI 1651831365 +0200 commit: file1 -29d32b3857eab1a570b9fc534dd90b9876c5cd1a b71c3131aa943097c697d5194d0f4de01f82b743 CI 1651831365 +0200 commit: file2 diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/logs/refs/stash b/test/integration/stashStagedChanges/expected/repo/.git_keep/logs/refs/stash deleted file mode 100644 index e5d15aef0..000000000 --- a/test/integration/stashStagedChanges/expected/repo/.git_keep/logs/refs/stash +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 cc4c970471739bc691d2e94cdb419f6e7932f396 CI 1651831372 +0200 On master: stash staged diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67..000000000 Binary files a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 and /dev/null differ diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da deleted file mode 100644 index ea6cd3866..000000000 Binary files a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/28/59c9a5f343c80929844d6e49d3792b9169c4da and /dev/null differ diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/29/d32b3857eab1a570b9fc534dd90b9876c5cd1a b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/29/d32b3857eab1a570b9fc534dd90b9876c5cd1a deleted file mode 100644 index 7363877b2..000000000 --- a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/29/d32b3857eab1a570b9fc534dd90b9876c5cd1a +++ /dev/null @@ -1,3 +0,0 @@ -xM -0@a9EgҀU1LR"x|{odkmCH$E 0Β8Z:rfCݒ$KRM*N -3p vqqz۾MH0g=M]VE9 \ No newline at end of file diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d..000000000 Binary files a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da and /dev/null differ diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/4f/301f03a7f9c5a3c98aa219dd0f184afec3f248 b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/4f/301f03a7f9c5a3c98aa219dd0f184afec3f248 deleted file mode 100644 index 6dc24b6d3..000000000 Binary files a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/4f/301f03a7f9c5a3c98aa219dd0f184afec3f248 and /dev/null differ diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/67/9786f833f91434f42757cc4b3bfb9ee1c573c5 b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/67/9786f833f91434f42757cc4b3bfb9ee1c573c5 deleted file mode 100644 index add1a9479..000000000 --- a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/67/9786f833f91434f42757cc4b3bfb9ee1c573c5 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0E]$IDDzi2iK㛍{/ SEfҘ5!vL1xf!%[)ƻ,&9X>aI˛YRua0>ಽr;M ZEUWu /1 XKA \ No newline at end of file diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/6c/d167c43cd50ae47f776f182ed6ff0b0a4471e3 b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/6c/d167c43cd50ae47f776f182ed6ff0b0a4471e3 deleted file mode 100644 index 1cf887e68..000000000 Binary files a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/6c/d167c43cd50ae47f776f182ed6ff0b0a4471e3 and /dev/null differ diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06d..000000000 Binary files a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c and /dev/null differ diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/b7/1c3131aa943097c697d5194d0f4de01f82b743 b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/b7/1c3131aa943097c697d5194d0f4de01f82b743 deleted file mode 100644 index a0d6edf73..000000000 Binary files a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/b7/1c3131aa943097c697d5194d0f4de01f82b743 and /dev/null differ diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a deleted file mode 100644 index ee4385f12..000000000 Binary files a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a and /dev/null differ diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/cc/4c970471739bc691d2e94cdb419f6e7932f396 b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/cc/4c970471739bc691d2e94cdb419f6e7932f396 deleted file mode 100644 index 8bc1b9af9..000000000 Binary files a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/cc/4c970471739bc691d2e94cdb419f6e7932f396 and /dev/null differ diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/stashStagedChanges/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/stashStagedChanges/expected/repo/.git_keep/objects/fb/0410e49f4f878fc7a57497556a45c7d052a63e b/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/fb/0410e49f4f878fc7a57497556a45c7d052a63e deleted file mode 100644 index bd48dab01..000000000 --- a/test/integration/stashStagedChanges/expected/repo/.git_keep/objects/fb/0410e49f4f878fc7a57497556a45c7d052a63e +++ /dev/null @@ -1 +0,0 @@ -xj1 SW[-!pvR۲LηƁ|~>c6e:H4w39J 5{D-IC(n*ŀ!š[ BwjCP'Ωg.:GVW1 5.g~m;o6\H1C=x1~F>>G뗫4LR \ No newline at end of file diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/refs/heads/master b/test/integration/stashStagedChanges/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 218f6a270..000000000 --- a/test/integration/stashStagedChanges/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -b71c3131aa943097c697d5194d0f4de01f82b743 diff --git a/test/integration/stashStagedChanges/expected/repo/.git_keep/refs/stash b/test/integration/stashStagedChanges/expected/repo/.git_keep/refs/stash deleted file mode 100644 index 58354ed35..000000000 --- a/test/integration/stashStagedChanges/expected/repo/.git_keep/refs/stash +++ /dev/null @@ -1 +0,0 @@ -cc4c970471739bc691d2e94cdb419f6e7932f396 diff --git a/test/integration/stashStagedChanges/expected/repo/file0 b/test/integration/stashStagedChanges/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/stashStagedChanges/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/stashStagedChanges/expected/repo/file1 b/test/integration/stashStagedChanges/expected/repo/file1 deleted file mode 100644 index c7c7da3c6..000000000 --- a/test/integration/stashStagedChanges/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -hello there diff --git a/test/integration/stashStagedChanges/expected/repo/file2 b/test/integration/stashStagedChanges/expected/repo/file2 deleted file mode 100644 index c7c7da3c6..000000000 --- a/test/integration/stashStagedChanges/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -hello there diff --git a/test/integration/stashStagedChanges/expected/repo/file3 b/test/integration/stashStagedChanges/expected/repo/file3 deleted file mode 100644 index c7c7da3c6..000000000 --- a/test/integration/stashStagedChanges/expected/repo/file3 +++ /dev/null @@ -1 +0,0 @@ -hello there diff --git a/test/integration/stashStagedChanges/recording.json b/test/integration/stashStagedChanges/recording.json deleted file mode 100644 index 70962d14a..000000000 --- a/test/integration/stashStagedChanges/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":1280,"Mod":0,"Key":256,"Ch":32},{"Timestamp":2255,"Mod":0,"Key":256,"Ch":106},{"Timestamp":2343,"Mod":0,"Key":256,"Ch":106},{"Timestamp":2674,"Mod":0,"Key":256,"Ch":32},{"Timestamp":3166,"Mod":0,"Key":256,"Ch":83},{"Timestamp":4209,"Mod":0,"Key":256,"Ch":115},{"Timestamp":4609,"Mod":0,"Key":256,"Ch":115},{"Timestamp":4677,"Mod":0,"Key":256,"Ch":116},{"Timestamp":4764,"Mod":0,"Key":256,"Ch":97},{"Timestamp":4831,"Mod":0,"Key":256,"Ch":115},{"Timestamp":4956,"Mod":0,"Key":256,"Ch":104},{"Timestamp":5090,"Mod":0,"Key":256,"Ch":32},{"Timestamp":5382,"Mod":0,"Key":256,"Ch":115},{"Timestamp":5442,"Mod":0,"Key":256,"Ch":116},{"Timestamp":5529,"Mod":0,"Key":256,"Ch":97},{"Timestamp":5632,"Mod":0,"Key":256,"Ch":103},{"Timestamp":5696,"Mod":0,"Key":256,"Ch":101},{"Timestamp":5836,"Mod":0,"Key":256,"Ch":100},{"Timestamp":6323,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7236,"Mod":0,"Key":256,"Ch":53},{"Timestamp":8544,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9140,"Mod":0,"Key":13,"Ch":13},{"Timestamp":10071,"Mod":0,"Key":256,"Ch":50},{"Timestamp":10936,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":239,"Height":56}]} diff --git a/test/integration/stashStagedChanges/setup.sh b/test/integration/stashStagedChanges/setup.sh deleted file mode 100644 index caff56b7d..000000000 --- a/test/integration/stashStagedChanges/setup.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -echo test0 > file0 -git add . -git commit -am file0 - -echo test1 > file1 -git add . -git commit -am file1 - -echo test2 > file2 -git add . -git commit -am file2 - -echo "hello there" > file1 -echo "hello there" > file2 -echo "hello there" > file3 diff --git a/test/integration/stashStagedChanges/test.json b/test/integration/stashStagedChanges/test.json deleted file mode 100644 index 4f9314caa..000000000 --- a/test/integration/stashStagedChanges/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "Stashing some files", "speed": 5 } diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index a7a2e0039..000000000 --- a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -[lazygit] stashing unstaged changes diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/FETCH_HEAD b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/HEAD b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/ORIG_HEAD b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 1a390f25a..000000000 --- a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -70dfa7fd25e9af49b7277738270a61d5dfbbac53 diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/config b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/config deleted file mode 100644 index 596ebaeb3..000000000 --- a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true -[user] - email = CI@example.com - name = CI diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/description b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/stashUnstagedChanges/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/stashUnstagedChanges/expected/repo/.git_keep/index b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/index deleted file mode 100644 index 4421704b3..000000000 Binary files a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/info/exclude b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/logs/HEAD b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index bf3da7509..000000000 --- a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,6 +0,0 @@ -0000000000000000000000000000000000000000 f8e5bdb9f59bd7ae0c72bb4aa0bb9d6af96ec689 CI 1651831332 +0200 commit (initial): file0 -f8e5bdb9f59bd7ae0c72bb4aa0bb9d6af96ec689 e702e6113eff6883a33505e2b28cff2df3420fed CI 1651831332 +0200 commit: file1 -e702e6113eff6883a33505e2b28cff2df3420fed b245d3aa308ffdfdd194a94ad84a678a8a7a028c CI 1651831332 +0200 commit: file2 -b245d3aa308ffdfdd194a94ad84a678a8a7a028c 70dfa7fd25e9af49b7277738270a61d5dfbbac53 CI 1651831340 +0200 commit: [lazygit] stashing unstaged changes -70dfa7fd25e9af49b7277738270a61d5dfbbac53 70dfa7fd25e9af49b7277738270a61d5dfbbac53 CI 1651831340 +0200 reset: moving to HEAD -70dfa7fd25e9af49b7277738270a61d5dfbbac53 b245d3aa308ffdfdd194a94ad84a678a8a7a028c CI 1651831340 +0200 reset: moving to HEAD^ diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index e46c60988..000000000 --- a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 f8e5bdb9f59bd7ae0c72bb4aa0bb9d6af96ec689 CI 1651831332 +0200 commit (initial): file0 -f8e5bdb9f59bd7ae0c72bb4aa0bb9d6af96ec689 e702e6113eff6883a33505e2b28cff2df3420fed CI 1651831332 +0200 commit: file1 -e702e6113eff6883a33505e2b28cff2df3420fed b245d3aa308ffdfdd194a94ad84a678a8a7a028c CI 1651831332 +0200 commit: file2 -b245d3aa308ffdfdd194a94ad84a678a8a7a028c 70dfa7fd25e9af49b7277738270a61d5dfbbac53 CI 1651831340 +0200 commit: [lazygit] stashing unstaged changes -70dfa7fd25e9af49b7277738270a61d5dfbbac53 b245d3aa308ffdfdd194a94ad84a678a8a7a028c CI 1651831340 +0200 reset: moving to HEAD^ diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/logs/refs/stash b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/logs/refs/stash deleted file mode 100644 index 869d2d514..000000000 --- a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/logs/refs/stash +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 80a20247e61d440004def8f284964334ee381d0a CI 1651831340 +0200 On master: unstaged diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67..000000000 Binary files a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 and /dev/null differ diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d..000000000 Binary files a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da and /dev/null differ diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 deleted file mode 100644 index 6a6f24362..000000000 Binary files a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/5c/ef9afea6a37d89f925e24ebf71adecb63d1f07 and /dev/null differ diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 deleted file mode 100644 index c84b87a17..000000000 --- a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448 +++ /dev/null @@ -1,3 +0,0 @@ -x+)JMUd040031QHI5`ֶww.hT[H - e"ǨS,gu"YH -$x~5(;rբW-Ж+^ \ No newline at end of file diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/70/dfa7fd25e9af49b7277738270a61d5dfbbac53 b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/70/dfa7fd25e9af49b7277738270a61d5dfbbac53 deleted file mode 100644 index 9ba23ed1e..000000000 --- a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/70/dfa7fd25e9af49b7277738270a61d5dfbbac53 +++ /dev/null @@ -1,3 +0,0 @@ -x -0E]+f/H^S7I&I }Ѧ~.aǾT9:0%FWT-}E=&E^+"#1%N̪tђ*t -M }7/aUQJ8K-8q?s}yVh)>#Chq??F. \ No newline at end of file diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/80/a20247e61d440004def8f284964334ee381d0a b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/80/a20247e61d440004def8f284964334ee381d0a deleted file mode 100644 index 8f444fade..000000000 Binary files a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/80/a20247e61d440004def8f284964334ee381d0a and /dev/null differ diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06d..000000000 Binary files a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c and /dev/null differ diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/b2/45d3aa308ffdfdd194a94ad84a678a8a7a028c b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/b2/45d3aa308ffdfdd194a94ad84a678a8a7a028c deleted file mode 100644 index 847d9486a..000000000 --- a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/b2/45d3aa308ffdfdd194a94ad84a678a8a7a028c +++ /dev/null @@ -1,3 +0,0 @@ -xM -0@a9ȄIF1d -%ǷGpN}W7 j*T+eՒ(O5iDd5"Q5V?~}m[R -#33;1Ol^: \ No newline at end of file diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/bc/4b1a5b9b60d70107fab9078137bad212e29567 b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/bc/4b1a5b9b60d70107fab9078137bad212e29567 deleted file mode 100644 index 07c62f2ce..000000000 --- a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/bc/4b1a5b9b60d70107fab9078137bad212e29567 +++ /dev/null @@ -1 +0,0 @@ -xAj0E)f($kFBV9Cb$lC$[7w/.×1&!e.<ѱDtb9R7ޤu@ cfŅ-<#*y|S\oWyMk: 'mVzDukz+<y68I4sdWNy \ No newline at end of file diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a deleted file mode 100644 index ee4385f12..000000000 Binary files a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/c7/c7da3c64e86c3270f2639a1379e67e14891b6a and /dev/null differ diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/stashUnstagedChanges/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/stashUnstagedChanges/expected/repo/.git_keep/objects/e7/02e6113eff6883a33505e2b28cff2df3420fed b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/e7/02e6113eff6883a33505e2b28cff2df3420fed deleted file mode 100644 index f70dd165a..000000000 --- a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/e7/02e6113eff6883a33505e2b28cff2df3420fed +++ /dev/null @@ -1,3 +0,0 @@ -xM -0@a9EL&1& Z[Jo-l:w_j+d! f_")H3; J-YA/%2C)T -d_a_^Eo0!0g=MuP; \ No newline at end of file diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/f8/e5bdb9f59bd7ae0c72bb4aa0bb9d6af96ec689 b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/f8/e5bdb9f59bd7ae0c72bb4aa0bb9d6af96ec689 deleted file mode 100644 index 06d1efef3..000000000 Binary files a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/objects/f8/e5bdb9f59bd7ae0c72bb4aa0bb9d6af96ec689 and /dev/null differ diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/refs/heads/master b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index eb757b2d0..000000000 --- a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -b245d3aa308ffdfdd194a94ad84a678a8a7a028c diff --git a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/refs/stash b/test/integration/stashUnstagedChanges/expected/repo/.git_keep/refs/stash deleted file mode 100644 index 607b99017..000000000 --- a/test/integration/stashUnstagedChanges/expected/repo/.git_keep/refs/stash +++ /dev/null @@ -1 +0,0 @@ -80a20247e61d440004def8f284964334ee381d0a diff --git a/test/integration/stashUnstagedChanges/expected/repo/file0 b/test/integration/stashUnstagedChanges/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/stashUnstagedChanges/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/stashUnstagedChanges/expected/repo/file1 b/test/integration/stashUnstagedChanges/expected/repo/file1 deleted file mode 100644 index c7c7da3c6..000000000 --- a/test/integration/stashUnstagedChanges/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -hello there diff --git a/test/integration/stashUnstagedChanges/expected/repo/file2 b/test/integration/stashUnstagedChanges/expected/repo/file2 deleted file mode 100644 index c7c7da3c6..000000000 --- a/test/integration/stashUnstagedChanges/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -hello there diff --git a/test/integration/stashUnstagedChanges/expected/repo/file3 b/test/integration/stashUnstagedChanges/expected/repo/file3 deleted file mode 100644 index c7c7da3c6..000000000 --- a/test/integration/stashUnstagedChanges/expected/repo/file3 +++ /dev/null @@ -1 +0,0 @@ -hello there diff --git a/test/integration/stashUnstagedChanges/recording.json b/test/integration/stashUnstagedChanges/recording.json deleted file mode 100644 index 78feca750..000000000 --- a/test/integration/stashUnstagedChanges/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":1319,"Mod":0,"Key":256,"Ch":32},{"Timestamp":2975,"Mod":0,"Key":256,"Ch":83},{"Timestamp":5557,"Mod":0,"Key":256,"Ch":117},{"Timestamp":7054,"Mod":0,"Key":256,"Ch":117},{"Timestamp":7219,"Mod":0,"Key":256,"Ch":110},{"Timestamp":7262,"Mod":0,"Key":256,"Ch":115},{"Timestamp":7319,"Mod":0,"Key":256,"Ch":116},{"Timestamp":7404,"Mod":0,"Key":256,"Ch":97},{"Timestamp":7492,"Mod":0,"Key":256,"Ch":103},{"Timestamp":7534,"Mod":0,"Key":256,"Ch":101},{"Timestamp":7679,"Mod":0,"Key":256,"Ch":100},{"Timestamp":7965,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9053,"Mod":0,"Key":256,"Ch":53},{"Timestamp":10348,"Mod":0,"Key":256,"Ch":32},{"Timestamp":10979,"Mod":0,"Key":13,"Ch":13},{"Timestamp":12354,"Mod":0,"Key":256,"Ch":50},{"Timestamp":12874,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":239,"Height":56}]} diff --git a/test/integration/stashUnstagedChanges/setup.sh b/test/integration/stashUnstagedChanges/setup.sh deleted file mode 100644 index caff56b7d..000000000 --- a/test/integration/stashUnstagedChanges/setup.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -echo test0 > file0 -git add . -git commit -am file0 - -echo test1 > file1 -git add . -git commit -am file1 - -echo test2 > file2 -git add . -git commit -am file2 - -echo "hello there" > file1 -echo "hello there" > file2 -echo "hello there" > file3 diff --git a/test/integration/stashUnstagedChanges/test.json b/test/integration/stashUnstagedChanges/test.json deleted file mode 100644 index 4f9314caa..000000000 --- a/test/integration/stashUnstagedChanges/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "Stashing some files", "speed": 5 }