migrate stash tests

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
+}

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"),
+			)
+	},
+})

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"),
+		)
+	},
+})

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 +"))
+	},
+})

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()
+	},
+})

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"),
+			)
+	},
+})

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()
 

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()
+	},
+})

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"),
+			)
+	},
+})

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(),
+			)
+	},
+})

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(),
+			)
+	},
+})

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,

test/integration/stash/expected/repo/.git_keep/COMMIT_EDITMSG

@@ -1 +0,0 @@
-file2

test/integration/stash/expected/repo/.git_keep/HEAD

@@ -1 +0,0 @@
-ref: refs/heads/master

test/integration/stash/expected/repo/.git_keep/ORIG_HEAD

@@ -1 +0,0 @@
-6b1f87e5b74cd77d755d213e0850f4de02b3cdce

test/integration/stash/expected/repo/.git_keep/config

@@ -1,8 +0,0 @@
-[core]
-	repositoryformatversion = 0
-	filemode = true
-	bare = false
-	logallrefupdates = true
-[user]
-	email = CI@example.com
-	name = CI

test/integration/stash/expected/repo/.git_keep/description

@@ -1 +0,0 @@
-Unnamed repository; edit this file 'description' to name the repository.

test/integration/stash/expected/repo/.git_keep/info/exclude

@@ -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]
-# *~

test/integration/stash/expected/repo/.git_keep/logs/HEAD

@@ -1,5 +0,0 @@
-0000000000000000000000000000000000000000 8c3123f6f4cee663b57398072df088c6f2dfeb9b CI <CI@example.com> 1650002552 +0200	commit (initial): file0
-8c3123f6f4cee663b57398072df088c6f2dfeb9b f7114350b59290905115d7918efe144eb2c62a76 CI <CI@example.com> 1650002552 +0200	commit: file1
-f7114350b59290905115d7918efe144eb2c62a76 6b1f87e5b74cd77d755d213e0850f4de02b3cdce CI <CI@example.com> 1650002552 +0200	commit: file2
-6b1f87e5b74cd77d755d213e0850f4de02b3cdce 6b1f87e5b74cd77d755d213e0850f4de02b3cdce CI <CI@example.com> 1650002559 +0200	reset: moving to HEAD
-6b1f87e5b74cd77d755d213e0850f4de02b3cdce 6b1f87e5b74cd77d755d213e0850f4de02b3cdce CI <CI@example.com> 1650002567 +0200	reset: moving to HEAD

test/integration/stash/expected/repo/.git_keep/logs/refs/heads/master

@@ -1,3 +0,0 @@
-0000000000000000000000000000000000000000 8c3123f6f4cee663b57398072df088c6f2dfeb9b CI <CI@example.com> 1650002552 +0200	commit (initial): file0
-8c3123f6f4cee663b57398072df088c6f2dfeb9b f7114350b59290905115d7918efe144eb2c62a76 CI <CI@example.com> 1650002552 +0200	commit: file1
-f7114350b59290905115d7918efe144eb2c62a76 6b1f87e5b74cd77d755d213e0850f4de02b3cdce CI <CI@example.com> 1650002552 +0200	commit: file2

test/integration/stash/expected/repo/.git_keep/logs/refs/stash

@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 be485112173592dea7b39c7efc3a6f52f43b71b9 CI <CI@example.com> 1650002559 +0200	On master: asd

test/integration/stash/expected/repo/.git_keep/objects/4f/9ff661c6c81b54d631d6d7c71399972e5c7a58

@@ -1,2 +0,0 @@
-x
<01><>K
-1D]<5D><14><17><>I<EFBFBD><49><EFBFBD><08><F>0<>a<EFBFBD><61><EFBFBD><EFBFBD>ƽۢ<C6BD><DBA2>K<EFBFBD>ֹ<EFBFBD>Ѽ<EFBFBD><D1BC>x<>X\r6K0<4B>68o%<10>#<23>cd-ev<65><76>5l<35>tpQ<17>B<EFBFBD>m<EFBFBD>̙<EFBFBD><CC99>ѓ<EFBFBD>',<03>&N)'Q<><51>m<><6D>η<>U><3E><>O9<4F>V/<2F>!<21>!ǰ<>q<EFBFBD>F:<3A><><EFBFBD>YW<59><57><EFBFBD>m<>^cu<63>YA<59><41>b<EFBFBD><17>aA<61>

test/integration/stash/expected/repo/.git_keep/objects/66/bbc809cdafd867cf9320bfb7484bb8fa898448

@@ -1,3 +0,0 @@
-x
+)JMU<4D><55>d040031QH<51><48>I5`<60><10><><EFBFBD><EFBFBD><EFBFBD>ֶw<D6B6><77><EFBFBD>w.<2E><>h<EFBFBD>T<EFBFBD>[H
-<19><1F>e<EFBFBD><65>"Ǩ<>S<EFBFBD>,<2C><>gu"<22><>YH
-<EFBFBD>$x~5(<28>;<3B>rբ<72><D5A2><EFBFBD><EFBFBD>W<EFBFBD><57>-<2D>
Ж+^

test/integration/stash/expected/repo/.git_keep/objects/81/f9f45d5eca6c23bf25b4a53172bcfb5ceb3963

@@ -1,2 +0,0 @@
-x
<01><><EFBFBD>
-<EFBFBD>0E]<5D>+f/<2F>$<24>c*"BW<42><57><&X0M<30><11><>f<EFBFBD><66><EFBFBD><EFBFBD><EFBFBD>‰<EFBFBD><C289><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>vf<76>6<EFBFBD>H8<48><38>s"<22>b<07>!<07>I<EFBFBD>@<40><>HZ<48><5A><EFBFBD><EFBFBD>kd&Ǧ<>19<31><39>1IɁ<49>f<>Ub<>,<2C><>=<3D><0E><0C>i~<7E><><EFBFBD><EFBFBD><EFBFBD>K<EFBFBD><4B><0E>DTƌpF<70>(:<3A>Q<EFBFBD><51><EFBFBD>Ų&><3E><>P<EFBFBD><50><EFBFBD><EFBFBD><EFBFBD>*<2A>ˋ<EFBFBD><CB8B>
<01>Bf

test/integration/stash/expected/repo/.git_keep/objects/8c/3123f6f4cee663b57398072df088c6f2dfeb9b

@@ -1,3 +0,0 @@
-x
<01><>A
-<EFBFBD>0Fa<46>9<EFBFBD><39><05><><EFBFBD>Ԁ<EFBFBD><D480>U<EFBFBD><55>4<34><7F>)z<><7A>n<1F><>պt<D5BA><74><EFBFBD><EFBFBD>
dq<64>R!'<27><1F><05><><EFBFBD><16><><EFBFBD>hP<><7F>6'z<><7A>{<7B><><15><><EFBFBD>Y<><59>Y<EFBFBD><13><>0<EFBFBD><30><EFBFBD><EFBFBD><EFBFBD>?<3F>)<29>
-6֒+<2B>

test/integration/stash/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641

@@ -1,2 +0,0 @@
-x
+)JMU03c040031QH<51><48>I5`<60><10><><EFBFBD><EFBFBD><EFBFBD>ֶw<D6B6><77><EFBFBD>w.<2E><>h<EFBFBD>T<EFBFBD>[H
-<19><>y<EFBFBD>W5<57>Ɨ<EFBFBD><C697>(<28>|<7C>
^-<2D>W
(x9

test/integration/stash/expected/repo/.git_keep/refs/heads/master

@@ -1 +0,0 @@
-6b1f87e5b74cd77d755d213e0850f4de02b3cdce

test/integration/stash/expected/repo/.git_keep/refs/stash

@@ -1 +0,0 @@
-be485112173592dea7b39c7efc3a6f52f43b71b9

test/integration/stash/expected/repo/file0

@@ -1 +0,0 @@
-test0

test/integration/stash/expected/repo/file1

@@ -1 +0,0 @@
-hello there

test/integration/stash/expected/repo/file2

@@ -1 +0,0 @@
-hello there

test/integration/stash/expected/repo/file3

@@ -1 +0,0 @@
-hello there

test/integration/stash/recording.json

@@ -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}]}

test/integration/stash/setup.sh

@@ -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

test/integration/stash/test.json

@@ -1 +0,0 @@
-{ "description": "Stashing some files", "speed": 5 }

test/integration/stashAllChanges/expected/repo/.git_keep/COMMIT_EDITMSG

@@ -1 +0,0 @@
-file2

test/integration/stashAllChanges/expected/repo/.git_keep/HEAD

@@ -1 +0,0 @@
-ref: refs/heads/master

test/integration/stashAllChanges/expected/repo/.git_keep/ORIG_HEAD

@@ -1 +0,0 @@
-cb66567aecbd1ceb7caebf1c3a3d16db28f4a54c

test/integration/stashAllChanges/expected/repo/.git_keep/config

@@ -1,8 +0,0 @@
-[core]
-	repositoryformatversion = 0
-	filemode = true
-	bare = false
-	logallrefupdates = true
-[user]
-	email = CI@example.com
-	name = CI

test/integration/stashAllChanges/expected/repo/.git_keep/description

@@ -1 +0,0 @@
-Unnamed repository; edit this file 'description' to name the repository.

test/integration/stashAllChanges/expected/repo/.git_keep/info/exclude

@@ -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]
-# *~

test/integration/stashAllChanges/expected/repo/.git_keep/logs/HEAD

@@ -1,6 +0,0 @@
-0000000000000000000000000000000000000000 a52c63287cda99fcc917438c34ac8f9c67274d79 CI <CI@example.com> 1651830755 +0200	commit (initial): file0
-a52c63287cda99fcc917438c34ac8f9c67274d79 283a00085a0d95e814920f9eae7009789cee0eab CI <CI@example.com> 1651830755 +0200	commit: file1
-283a00085a0d95e814920f9eae7009789cee0eab cb66567aecbd1ceb7caebf1c3a3d16db28f4a54c CI <CI@example.com> 1651830755 +0200	commit: file2
-cb66567aecbd1ceb7caebf1c3a3d16db28f4a54c cb66567aecbd1ceb7caebf1c3a3d16db28f4a54c CI <CI@example.com> 1651830760 +0200	reset: moving to HEAD
-cb66567aecbd1ceb7caebf1c3a3d16db28f4a54c cb66567aecbd1ceb7caebf1c3a3d16db28f4a54c CI <CI@example.com> 1651830769 +0200	reset: moving to HEAD
-cb66567aecbd1ceb7caebf1c3a3d16db28f4a54c cb66567aecbd1ceb7caebf1c3a3d16db28f4a54c CI <CI@example.com> 1651830778 +0200	reset: moving to HEAD

test/integration/stashAllChanges/expected/repo/.git_keep/logs/refs/heads/master

@@ -1,3 +0,0 @@
-0000000000000000000000000000000000000000 a52c63287cda99fcc917438c34ac8f9c67274d79 CI <CI@example.com> 1651830755 +0200	commit (initial): file0
-a52c63287cda99fcc917438c34ac8f9c67274d79 283a00085a0d95e814920f9eae7009789cee0eab CI <CI@example.com> 1651830755 +0200	commit: file1
-283a00085a0d95e814920f9eae7009789cee0eab cb66567aecbd1ceb7caebf1c3a3d16db28f4a54c CI <CI@example.com> 1651830755 +0200	commit: file2

test/integration/stashAllChanges/expected/repo/.git_keep/logs/refs/stash

@@ -1,3 +0,0 @@
-0000000000000000000000000000000000000000 df9f3a300512205640e5ff10b624072a10afddde CI <CI@example.com> 1651830760 +0200	On master: stash all
-df9f3a300512205640e5ff10b624072a10afddde 6b8c369acb1897a5787e72b4c15d597d346f2b6a CI <CI@example.com> 1651830769 +0200	On master: stash newly tracked
-6b8c369acb1897a5787e72b4c15d597d346f2b6a 5a70ee314842fb5f46b452d16bc4d95e7154d4b4 CI <CI@example.com> 1651830778 +0200	On master: stash with staged

test/integration/stashAllChanges/expected/repo/.git_keep/objects/28/3a00085a0d95e814920f9eae7009789cee0eab

@@ -1,2 +0,0 @@
-x
<01><>K
-<EFBFBD>0@]<5D><14>$<24>ɀ<EFBFBD><C980>U<EFBFBD>1N&X0<58><30><1E><1E><><EFBFBD>=x<><78><EFBFBD>p<>OcW<63>j1<6A><31><EFBFBD>%f_CnA<><41>jPl<>stf<74>]<5D>8y<38><79><17><>D<EFBFBD>H<1D>P$D<><44>H2z<32><15><>g<<3C><1D><19><>|<7C>/<2F><><EFBFBD>Y<>

test/integration/stashAllChanges/expected/repo/.git_keep/objects/65/e3f346ea03c8c2b0f1b8f6691abaed651fb77d

@@ -1,3 +0,0 @@
-x
<01><><EFBFBD>
-<EFBFBD>0E]<5D>+f/H<><48>("BW<42><57>I2<49>BӔ<1A><>o6<6F><36><1E><><EFBFBD>TK<54>h<>Omg<06>Nk<4E>#<23><><EFBFBD>S<EFBFBD>$<24><>̈6Ā6<C480><36><EFBFBD>O<18>F;<3B>
-RDt<EFBFBD><EFBFBD>S<EFBFBD>*q<><71>8N*2Ya<59>:L<><4C>M<EFBFBD>><3E>UwF<><0F><>*<2A>—T<C297><03><>

test/integration/stashAllChanges/expected/repo/.git_keep/objects/6b/8c369acb1897a5787e72b4c15d597d346f2b6a

@@ -1,2 +0,0 @@
-x
<01><><EFBFBD>J1<10>a<EFBFBD><61><14>$<24>Jjf5+<2B><>R<EFBFBD>0<EFBFBD><30>{莨oo6<6F><36>>~8<><38><EFBFBD>><3E>ax<18>*<2A>I<>c<EFBFBD><63>K6<4B>(<28>PQU<><55><15>H*/w<>u 1bb<62>R<EFBFBD>hI<68>Z<EFBFBD>ϾZ<CFBE><5A><EFBFBD>8<06><><18><>6*<2A><>WL<57>%7D<37>\X+F<>JJu<4A><75>q<EFBFBD>v8_<38><5F>|y<>o<EFBFBD><6F><EFBFBD>><3E><>_<EFBFBD>N<EFBFBD><4E>IH<49>h<EFBFBD>1<EFBFBD>\牡<><E789A1><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD>Op><3E><><EFBFBD><EFBFBD><EFBFBD><07><><EFBFBD><EFBFBD><EFBFBD>z1Q<31>

test/integration/stashAllChanges/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641

@@ -1,2 +0,0 @@
-x
+)JMU03c040031QH<51><48>I5`<60><10><><EFBFBD><EFBFBD><EFBFBD>ֶw<D6B6><77><EFBFBD>w.<2E><>h<EFBFBD>T<EFBFBD>[H
-<19><>y<EFBFBD>W5<57>Ɨ<EFBFBD><C697>(<28>|<7C>
^-<2D>W
(x9

test/integration/stashAllChanges/expected/repo/.git_keep/objects/df/9f3a300512205640e5ff10b624072a10afddde

@@ -1,3 +0,0 @@
-x
<01>ϽJA`<60>}<7D><><05>ߞY.<2E><>g<EFBFBD><67>Nع=vG<76><47><EFBFBD><EFBFBD>ܴ꣠x<EAA3A0><78>k@<40><>i<1C><>Ym%SB<53>E<EFBFBD>jk<6A><1A>6+<2B>D<EFBFBD>ao<>,:<3A>>`<06><><EFBFBD>lij<6C><C4B3>4<EFBFBD><34>Hӡ<48>P-QN<51><4E>5<EFBFBD>XjĘ<6A>Z<EFBFBD>3Ҡ<33>
-*
-<EFBFBD>	<09>,Ң<>B<EFBFBD><42><EFBFBD>p<><70><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?<3F><1F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>c<EFBFBD>5<EFBFBD><35><0E>]pn<70><6E><1<><31>|<7C><>C<EFBFBD>s<EFBFBD>W8<07>7<EFBFBD>m<EFBFBD>$<24>O<EFBFBD>

test/integration/stashAllChanges/expected/repo/.git_keep/refs/heads/master

@@ -1 +0,0 @@
-cb66567aecbd1ceb7caebf1c3a3d16db28f4a54c

test/integration/stashAllChanges/expected/repo/.git_keep/refs/stash

@@ -1 +0,0 @@
-5a70ee314842fb5f46b452d16bc4d95e7154d4b4

test/integration/stashAllChanges/expected/repo/file0

@@ -1 +0,0 @@
-test0

test/integration/stashAllChanges/expected/repo/file1

@@ -1 +0,0 @@
-hello there

test/integration/stashAllChanges/expected/repo/file2

@@ -1 +0,0 @@
-hello there

test/integration/stashAllChanges/expected/repo/file3

@@ -1 +0,0 @@
-hello there

test/integration/stashAllChanges/recording.json

@@ -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}]}

test/integration/stashAllChanges/setup.sh

@@ -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

test/integration/stashAllChanges/test.json

@@ -1 +0,0 @@
-{ "description": "Stashing all files", "speed": 5 }

test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/COMMIT_EDITMSG

@@ -1 +0,0 @@
-file2

test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/HEAD

@@ -1 +0,0 @@
-ref: refs/heads/master

test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/ORIG_HEAD

@@ -1 +0,0 @@
-056328ba39d0418acd7270389b9d5f253b98aabf

test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/config

@@ -1,8 +0,0 @@
-[core]
-	repositoryformatversion = 0
-	filemode = true
-	bare = false
-	logallrefupdates = true
-[user]
-	email = CI@example.com
-	name = CI

test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/description

@@ -1 +0,0 @@
-Unnamed repository; edit this file 'description' to name the repository.

test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/info/exclude

@@ -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]
-# *~

test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/logs/HEAD

@@ -1,4 +0,0 @@
-0000000000000000000000000000000000000000 5c7a56ef74b1a692d67990b3f07a3af45a0e8f48 CI <CI@example.com> 1651830909 +0200	commit (initial): file0
-5c7a56ef74b1a692d67990b3f07a3af45a0e8f48 81f8f7653f26197f4f66641d6ab4ab99ac2a3391 CI <CI@example.com> 1651830909 +0200	commit: file1
-81f8f7653f26197f4f66641d6ab4ab99ac2a3391 056328ba39d0418acd7270389b9d5f253b98aabf CI <CI@example.com> 1651830909 +0200	commit: file2
-056328ba39d0418acd7270389b9d5f253b98aabf 056328ba39d0418acd7270389b9d5f253b98aabf CI <CI@example.com> 1651830915 +0200	reset: moving to HEAD

test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/logs/refs/heads/master

@@ -1,3 +0,0 @@
-0000000000000000000000000000000000000000 5c7a56ef74b1a692d67990b3f07a3af45a0e8f48 CI <CI@example.com> 1651830909 +0200	commit (initial): file0
-5c7a56ef74b1a692d67990b3f07a3af45a0e8f48 81f8f7653f26197f4f66641d6ab4ab99ac2a3391 CI <CI@example.com> 1651830909 +0200	commit: file1
-81f8f7653f26197f4f66641d6ab4ab99ac2a3391 056328ba39d0418acd7270389b9d5f253b98aabf CI <CI@example.com> 1651830909 +0200	commit: file2

test/integration/stashAllChangesKeepIndex/expected/repo/.git_keep/logs/refs/stash

@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 c87c87eb867338ed9956f6b28c8c3a83a1802c16 CI <CI@example.com> 1651830915 +0200	On master: keep index