migrate more tests

pkg/integration/components/prompt_driver.go

@@ -32,8 +32,7 @@ func (self *PromptDriver) Type(value string) *PromptDriver {
 }
 
 func (self *PromptDriver) Clear() *PromptDriver {
-	// TODO: soft-code this
+	self.t.press(ClearKey)
-	self.t.press("<c-u>")
 
 	return self
 }

pkg/integration/components/search_driver.go

@@ -0,0 +1,39 @@
+package components
+
+// TODO: soft-code this
+const ClearKey = "<c-u>"
+
+type SearchDriver struct {
+	t *TestDriver
+}
+
+func (self *SearchDriver) getViewDriver() *ViewDriver {
+	return self.t.Views().Search()
+}
+
+// asserts on the text initially present in the prompt
+func (self *SearchDriver) InitialText(expected *matcher) *SearchDriver {
+	self.getViewDriver().Content(expected)
+
+	return self
+}
+
+func (self *SearchDriver) Type(value string) *SearchDriver {
+	self.t.typeContent(value)
+
+	return self
+}
+
+func (self *SearchDriver) Clear() *SearchDriver {
+	self.t.press(ClearKey)
+
+	return self
+}
+
+func (self *SearchDriver) Confirm() {
+	self.getViewDriver().PressEnter()
+}
+
+func (self *SearchDriver) Cancel() {
+	self.getViewDriver().PressEscape()
+}

pkg/integration/components/shell.go

@@ -179,7 +179,7 @@ func (self *Shell) StashWithMessage(message string) *Shell {
 }
 
 func (self *Shell) SetConfig(key string, value string) *Shell {
-	self.RunCommand(fmt.Sprintf(`git config --local "%s" %s`, key, value))
+	self.RunCommand(fmt.Sprintf(`git config --local "%s" "%s"`, key, value))
 	return self
 }
 

pkg/integration/components/test_driver.go

@@ -159,6 +159,19 @@ func (self *TestDriver) ExpectClipboard(matcher *matcher) {
 	})
 }
 
+func (self *TestDriver) ExpectSearch() *SearchDriver {
+	self.inSearch()
+
+	return &SearchDriver{t: self}
+}
+
+func (self *TestDriver) inSearch() {
+	self.assertWithRetries(func() (bool, string) {
+		currentView := self.gui.CurrentContext().GetView()
+		return currentView.Name() == "search", "Expected search prompt to be focused"
+	})
+}
+
 // for making assertions through git itself
 func (self *TestDriver) Git() *Git {
 	return &Git{assertionHelper: self.assertionHelper, shell: self.shell}

pkg/integration/components/views.go

@@ -127,3 +127,7 @@ func (self *Views) Suggestions() *ViewDriver {
 func (self *Views) MergeConflicts() *ViewDriver {
 	return self.byName("mergeConflicts")
 }
+
+func (self *Views) Search() *ViewDriver {
+	return self.byName("search")
+}

pkg/integration/tests/branch/reset_upstream.go

@@ -0,0 +1,36 @@
+package branch
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var ResetUpstream = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Reset the upstream of a branch",
+	ExtraCmdArgs: "",
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shell.EmptyCommit("one")
+		shell.CloneIntoRemote("origin")
+		shell.SetBranchUpstream("master", "origin/master")
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Branches().
+			Focus().
+			Press(keys.Universal.NextScreenMode). // we need to enlargen the window to see the upstream
+			Lines(
+				Contains("master").Contains("origin master").IsSelected(),
+			).
+			Press(keys.Branches.SetUpstream).
+			Tap(func() {
+				t.ExpectPopup().Menu().
+					Title(Equals("Set/unset upstream")).
+					Select(Contains("unset upstream of selected branch")).
+					Confirm()
+			}).
+			Lines(
+				Contains("master").DoesNotContain("origin master").IsSelected(),
+			)
+	},
+})

pkg/integration/tests/branch/set_upstream.go

@@ -0,0 +1,40 @@
+package branch
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var SetUpstream = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Set the upstream of a branch",
+	ExtraCmdArgs: "",
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shell.EmptyCommit("one")
+		shell.CloneIntoRemote("origin")
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Branches().
+			Focus().
+			Press(keys.Universal.NextScreenMode). // we need to enlargen the window to see the upstream
+			Lines(
+				Contains("master").DoesNotContain("origin master").IsSelected(),
+			).
+			Press(keys.Branches.SetUpstream).
+			Tap(func() {
+				t.ExpectPopup().Menu().
+					Title(Equals("Set/unset upstream")).
+					Select(Contains(" set upstream of selected branch")). // using leading space to disambiguate from the 'reset' option
+					Confirm()
+
+				t.ExpectPopup().Prompt().
+					Title(Equals("Enter upstream as '<remote> <branchname>'")).
+					SuggestionLines(Equals("origin master")).
+					ConfirmFirstSuggestion()
+			}).
+			Lines(
+				Contains("master").Contains("origin master").IsSelected(),
+			)
+	},
+})

pkg/integration/tests/commit/reset_author.go

@@ -0,0 +1,39 @@
+package commit
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var ResetAuthor = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Reset author on a commit",
+	ExtraCmdArgs: "",
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shell.SetConfig("user.email", "Bill@example.com")
+		shell.SetConfig("user.name", "Bill Smith")
+
+		shell.EmptyCommit("one")
+
+		shell.SetConfig("user.email", "John@example.com")
+		shell.SetConfig("user.name", "John Smith")
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Commits().
+			Focus().
+			Lines(
+				Contains("BS").Contains("one").IsSelected(),
+			).
+			Press(keys.Commits.ResetCommitAuthor).
+			Tap(func() {
+				t.ExpectPopup().Menu().
+					Title(Equals("Amend commit attribute")).
+					Select(Contains("reset author")).
+					Confirm()
+			}).
+			Lines(
+				Contains("JS").Contains("one").IsSelected(),
+			)
+	},
+})

pkg/integration/tests/commit/search.go

@@ -0,0 +1,107 @@
+package commit
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var Search = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Search for a commit",
+	ExtraCmdArgs: "",
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shell.EmptyCommit("one")
+		shell.EmptyCommit("two")
+		shell.EmptyCommit("three")
+		shell.EmptyCommit("four")
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Commits().
+			Focus().
+			Lines(
+				Contains("four").IsSelected(),
+				Contains("three"),
+				Contains("two"),
+				Contains("one"),
+			).
+			Press(keys.Universal.StartSearch).
+			Tap(func() {
+				t.ExpectSearch().
+					Type("two").
+					Confirm()
+
+				t.Views().Search().Content(Contains("matches for 'two' (1 of 1)"))
+			}).
+			Lines(
+				Contains("four"),
+				Contains("three"),
+				Contains("two").IsSelected(),
+				Contains("one"),
+			).
+			Press(keys.Universal.StartSearch).
+			Tap(func() {
+				t.ExpectSearch().
+					Type("o").
+					Confirm()
+
+				t.Views().Search().Content(Contains("matches for 'o' (2 of 3)"))
+			}).
+			Lines(
+				Contains("four"),
+				Contains("three"),
+				Contains("two").IsSelected(),
+				Contains("one"),
+			).
+			Press("n").
+			Tap(func() {
+				t.Views().Search().Content(Contains("matches for 'o' (3 of 3)"))
+			}).
+			Lines(
+				Contains("four"),
+				Contains("three"),
+				Contains("two"),
+				Contains("one").IsSelected(),
+			).
+			Press("n").
+			Tap(func() {
+				t.Views().Search().Content(Contains("matches for 'o' (1 of 3)"))
+			}).
+			Lines(
+				Contains("four").IsSelected(),
+				Contains("three"),
+				Contains("two"),
+				Contains("one"),
+			).
+			Press("n").
+			Tap(func() {
+				t.Views().Search().Content(Contains("matches for 'o' (2 of 3)"))
+			}).
+			Lines(
+				Contains("four"),
+				Contains("three"),
+				Contains("two").IsSelected(),
+				Contains("one"),
+			).
+			Press("N").
+			Tap(func() {
+				t.Views().Search().Content(Contains("matches for 'o' (1 of 3)"))
+			}).
+			Lines(
+				Contains("four").IsSelected(),
+				Contains("three"),
+				Contains("two"),
+				Contains("one"),
+			).
+			Press("N").
+			Tap(func() {
+				t.Views().Search().Content(Contains("matches for 'o' (3 of 3)"))
+			}).
+			Lines(
+				Contains("four"),
+				Contains("three"),
+				Contains("two"),
+				Contains("one").IsSelected(),
+			)
+	},
+})

pkg/integration/tests/commit/set_author.go

@@ -0,0 +1,51 @@
+package commit
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var SetAuthor = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Set author on a commit",
+	ExtraCmdArgs: "",
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shell.SetConfig("user.email", "Bill@example.com")
+		shell.SetConfig("user.name", "Bill Smith")
+
+		shell.EmptyCommit("one")
+
+		shell.SetConfig("user.email", "John@example.com")
+		shell.SetConfig("user.name", "John Smith")
+
+		shell.EmptyCommit("two")
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Commits().
+			Focus().
+			Lines(
+				Contains("JS").Contains("two").IsSelected(),
+				Contains("BS").Contains("one"),
+			).
+			Press(keys.Commits.ResetCommitAuthor).
+			Tap(func() {
+				t.ExpectPopup().Menu().
+					Title(Equals("Amend commit attribute")).
+					Select(Contains(" set author")). // adding space at start to distinguish from 'reset author'
+					Confirm()
+
+				t.ExpectPopup().Prompt().
+					Title(Contains("Set author")).
+					SuggestionLines(
+						Contains("John Smith"),
+						Contains("Bill Smith"),
+					).
+					ConfirmSuggestion(Contains("John Smith"))
+			}).
+			Lines(
+				Contains("JS").Contains("two").IsSelected(),
+				Contains("BS").Contains("one"),
+			)
+	},
+})

pkg/integration/tests/staging/search.go

@@ -0,0 +1,42 @@
+package staging
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var Search = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Use the search feature in the staging panel",
+	ExtraCmdArgs: "",
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shell.CreateFile("file1", "one\ntwo\nthree\nfour\nfive")
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Files().
+			IsFocused().
+			Lines(
+				Contains("file1").IsSelected(),
+			).
+			PressEnter()
+
+		t.Views().Staging().
+			IsFocused().
+			Press(keys.Universal.StartSearch).
+			Tap(func() {
+				t.ExpectSearch().
+					Type("four").
+					Confirm()
+
+				t.Views().Search().Content(Contains("matches for 'four' (1 of 1)"))
+			}).
+			SelectedLine(Contains("+four")). // stage the line
+			PressPrimaryAction().
+			Content(DoesNotContain("+four")).
+			Tap(func() {
+				t.Views().StagingSecondary().
+					Content(Contains("+four"))
+			})
+	},
+})

pkg/integration/tests/tests_gen.go

@@ -18,6 +18,7 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/misc"
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/patch_building"
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/reflog"
+	"github.com/jesseduffield/lazygit/pkg/integration/tests/staging"
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/stash"
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/submodule"
 	"github.com/jesseduffield/lazygit/pkg/integration/tests/sync"
@@ -38,6 +39,8 @@ var tests = []*components.IntegrationTest{
 	branch.RebaseAndDrop,
 	branch.RebaseDoesNotAutosquash,
 	branch.Reset,
+	branch.ResetUpstream,
+	branch.SetUpstream,
 	branch.Suggestions,
 	cherry_pick.CherryPick,
 	cherry_pick.CherryPickConflicts,
@@ -46,8 +49,11 @@ var tests = []*components.IntegrationTest{
 	commit.CreateTag,
 	commit.DiscardOldFileChange,
 	commit.NewBranch,
+	commit.ResetAuthor,
 	commit.Revert,
 	commit.RevertMerge,
+	commit.Search,
+	commit.SetAuthor,
 	commit.StageRangeOfLines,
 	commit.Staged,
 	commit.StagedWithoutHooks,
@@ -92,6 +98,7 @@ var tests = []*components.IntegrationTest{
 	reflog.CherryPick,
 	reflog.Patch,
 	reflog.Reset,
+	staging.Search,
 	stash.Apply,
 	stash.ApplyPatch,
 	stash.CreateBranch,

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

@@ -1 +0,0 @@
-myfile2

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

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

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

@@ -1,10 +0,0 @@
-[core]
-	repositoryformatversion = 0
-	filemode = true
-	bare = false
-	logallrefupdates = true
-	ignorecase = true
-	precomposeunicode = true
-[user]
-	email = Author2@example.com
-	name = Author2

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

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

test/integration/resetAuthor/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/resetAuthor/expected/repo/.git_keep/logs/HEAD

@@ -1,3 +0,0 @@
-0000000000000000000000000000000000000000 291bcc7e708303b395f52245ec988ddbc985bae3 Author1 <Author1@example.com> 1651932821 +0200	commit (initial): myfile1
-291bcc7e708303b395f52245ec988ddbc985bae3 63aff3f0f54955ea149f9c2f3c07697b8864940d Author1 <Author1@example.com> 1651932821 +0200	commit: myfile2
-63aff3f0f54955ea149f9c2f3c07697b8864940d 0714eb875f11c56a2dc8c53c148889fe43602349 Author2 <Author2@example.com> 1651932824 +0200	commit (amend): myfile2

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

@@ -1,3 +0,0 @@
-0000000000000000000000000000000000000000 291bcc7e708303b395f52245ec988ddbc985bae3 Author1 <Author1@example.com> 1651932821 +0200	commit (initial): myfile1
-291bcc7e708303b395f52245ec988ddbc985bae3 63aff3f0f54955ea149f9c2f3c07697b8864940d Author1 <Author1@example.com> 1651932821 +0200	commit: myfile2
-63aff3f0f54955ea149f9c2f3c07697b8864940d 0714eb875f11c56a2dc8c53c148889fe43602349 Author2 <Author2@example.com> 1651932824 +0200	commit (amend): myfile2

test/integration/resetAuthor/expected/repo/.git_keep/objects/29/1bcc7e708303b395f52245ec988ddbc985bae3

@@ -1,2 +0,0 @@
-x
<01><>Q
-<EFBFBD>0D<><44>)<29>_<EFBFBD>l<EFBFBD>ݦ <20>G<EFBFBD>&,t<><74>z{<7B>x
<01>fx0oR5[ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>S<EFBFBD><53><EFBFBD>4k<34>D<EFBFBD><44>s<EFBFBD> X&Zh<5A>LE<4C><18><۽<>p<EFBFBD><06><>W<EFBFBD><57>{lzJ<7A>.];<3B><<3C><10>>x<>:<3A>wM<77>:{<7B>uSt<1F><>5'

test/integration/resetAuthor/expected/repo/.git_keep/objects/63/aff3f0f54955ea149f9c2f3c07697b8864940d

@@ -1,2 +0,0 @@
-x
<01><>K
-1]<5D><14><0B><>$=iѣ<><D1A3><EFBFBD><EFBFBD><EFBFBD>3<11><><06><02><>xP<78><50><EFBFBD><EFBFBD><EFBFBD>5<EFBFBD>;<3B>]D<><44>:<3A><><EFBFBD>)E<>2<EFBFBD><10>D<EFBFBD><15>d*: <20><>]#dH9O2<4F>`<60>M<EFBFBD>}<7D><><EFBFBD>K<EFBFBD>JI>E<>*><3E>}<7D><><EFBFBD><0B><><EFBFBD>\<5C>۶<>)<29><><EFBFBD><EFBFBD><<3C>ŀ<EFBFBD><C580><06>Qc<1D><><EFBFBD><1D><><EFBFBD><EFBFBD>"<22>>dB<>

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

@@ -1 +0,0 @@
-0714eb875f11c56a2dc8c53c148889fe43602349

test/integration/resetAuthor/expected/repo/myfile1

@@ -1 +0,0 @@
-test1

test/integration/resetAuthor/expected/repo/myfile2

@@ -1 +0,0 @@
-test2

test/integration/resetAuthor/recording.json

@@ -1 +0,0 @@
-{"KeyEvents":[{"Timestamp":638,"Mod":0,"Key":256,"Ch":52},{"Timestamp":1406,"Mod":0,"Key":256,"Ch":97},{"Timestamp":2584,"Mod":0,"Key":256,"Ch":121},{"Timestamp":5654,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":117,"Height":83}]}

test/integration/resetAuthor/setup.sh

@@ -1,20 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $1
-
-git init
-
-git config user.email "Author1@example.com"
-git config user.name "Author1"
-
-echo test1 > myfile1
-git add .
-git commit -am "myfile1"
-echo test2 > myfile2
-git add .
-git commit -am "myfile2"
-
-git config user.email "Author2@example.com"
-git config user.name "Author2"

test/integration/resetAuthor/test.json

@@ -1 +0,0 @@
-{ "description": "In this test the author of a commit is reset to a different name/email.", "speed": 5 }

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

@@ -1 +0,0 @@
-asd

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

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

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

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

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

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

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

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

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

@@ -1,5 +0,0 @@
-0000000000000000000000000000000000000000 f05f4d92d7babb2f40ebd2829dccee0afff44c70 CI <CI@example.com> 1617671505 +1000	commit (initial): myfile1
-f05f4d92d7babb2f40ebd2829dccee0afff44c70 6b94b71598d5aa96357ab261599cfd99a4c2c9d0 CI <CI@example.com> 1617671505 +1000	commit: myfile2
-6b94b71598d5aa96357ab261599cfd99a4c2c9d0 5fb9c54526790a11246b733354bf896da8ffc09d CI <CI@example.com> 1617671505 +1000	commit: myfile3
-5fb9c54526790a11246b733354bf896da8ffc09d fc759ce6e48e0012eab3f02ec3524a55be938dd5 CI <CI@example.com> 1617671505 +1000	commit: myfile4
-fc759ce6e48e0012eab3f02ec3524a55be938dd5 3ec60bb22aa39d08428e57e3251563f797b40fc8 CI <CI@example.com> 1617671517 +1000	commit: asd

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

@@ -1,5 +0,0 @@
-0000000000000000000000000000000000000000 f05f4d92d7babb2f40ebd2829dccee0afff44c70 CI <CI@example.com> 1617671505 +1000	commit (initial): myfile1
-f05f4d92d7babb2f40ebd2829dccee0afff44c70 6b94b71598d5aa96357ab261599cfd99a4c2c9d0 CI <CI@example.com> 1617671505 +1000	commit: myfile2
-6b94b71598d5aa96357ab261599cfd99a4c2c9d0 5fb9c54526790a11246b733354bf896da8ffc09d CI <CI@example.com> 1617671505 +1000	commit: myfile3
-5fb9c54526790a11246b733354bf896da8ffc09d fc759ce6e48e0012eab3f02ec3524a55be938dd5 CI <CI@example.com> 1617671505 +1000	commit: myfile4
-fc759ce6e48e0012eab3f02ec3524a55be938dd5 3ec60bb22aa39d08428e57e3251563f797b40fc8 CI <CI@example.com> 1617671517 +1000	commit: asd

test/integration/searching/expected/repo/.git_keep/objects/5f/b9c54526790a11246b733354bf896da8ffc09d

@@ -1,2 +0,0 @@
-x
<01><>M
-<EFBFBD>0F]<5D><14><0B><>oD<><44>z<EFBFBD><7A>d<EFBFBD>cK<63><4B><EFBFBD>7Gp<47><70><EFBFBD><EFBFBD><EFBFBD>xkm<6B>П<>!<21>m<EFBFBD><6D>x<EFBFBD>P<EFBFBD>w<EFBFBD><77>w<EFBFBD>R
W'<27>Sv`9<0C><><EFBFBD>yu3<><33> <20>TFe<1B>@<40><05><[<5B>b<14><>c;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Cmʅ<7F>v<EFBFBD>!űa<C5B1>><3E>1F

test/integration/searching/expected/repo/.git_keep/objects/6b/94b71598d5aa96357ab261599cfd99a4c2c9d0

@@ -1,2 +0,0 @@
-x
<01><>M
-<EFBFBD>0@a<>9<EFBFBD><39><05>L<EFBFBD><4C>
<11><>#?3Xhl)<11><><EFBFBD>n<1F>╵<EFBFBD><E295B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>wHap6<70><36>X<EFBFBD><58>F<EFBFBD><46>Q3|%<25>J<EFBFBD>Q<EFBFBD>Y6[<5B><><EFBFBD>Aѫ<41><D1AB>j<EFBFBD>)gR<67><52>+])<29>RD0<44><30>s%<25>I<EFBFBD><49>\w'<27><><EFBFBD>C><3E>m<EFBFBD>\<5C><><EFBFBD>`<60>֣<><D6A3>EDs<44>c<EFBFBD>˟ܴ<CB9F>΋<EFBFBD><CE8B>
d=;g

test/integration/searching/expected/repo/.git_keep/objects/f0/5f4d92d7babb2f40ebd2829dccee0afff44c70

@@ -1,2 +0,0 @@
-x
<01><>A
-<EFBFBD>0@Q<>9<EFBFBD><39><05><><EFBFBD>I<11><>#M&X<><58>R"<22><><EFBFBD><11>~<1E><>̖<0E>r<EFBFBD><72>*<2A>J<EFBFBD><4A>d7<><37>Y)J<>4$<24><>g<EFBFBD>ᚲ\z<>W<EFBFBD>a<EFBFBD><61>>NO<4E>$<24>V<EFBFBD><56>f <20> <20><z8"<22><><1E><>rgߺ<67>J<EFBFBD>0<>,<2C>

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

@@ -1 +0,0 @@
-3ec60bb22aa39d08428e57e3251563f797b40fc8

test/integration/searching/expected/repo/myfile1

@@ -1 +0,0 @@
-test1

test/integration/searching/expected/repo/myfile3

@@ -1 +0,0 @@
-test3

test/integration/searching/expected/repo/myfile4

@@ -1 +0,0 @@
-test4

test/integration/searching/expected/repo/myfile5

@@ -1 +0,0 @@
-test5

test/integration/searching/recording.json

@@ -1 +0,0 @@
-{"KeyEvents":[{"Timestamp":521,"Mod":0,"Key":259,"Ch":0},{"Timestamp":681,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1282,"Mod":0,"Key":256,"Ch":47},{"Timestamp":1489,"Mod":0,"Key":256,"Ch":102},{"Timestamp":1593,"Mod":0,"Key":256,"Ch":105},{"Timestamp":1640,"Mod":0,"Key":256,"Ch":108},{"Timestamp":1722,"Mod":0,"Key":256,"Ch":101},{"Timestamp":2034,"Mod":0,"Key":256,"Ch":50},{"Timestamp":2473,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3209,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4514,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4889,"Mod":2,"Key":16,"Ch":16},{"Timestamp":5409,"Mod":0,"Key":258,"Ch":0},{"Timestamp":5713,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6002,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6490,"Mod":0,"Key":260,"Ch":0},{"Timestamp":6785,"Mod":0,"Key":260,"Ch":0},{"Timestamp":7825,"Mod":0,"Key":256,"Ch":47},{"Timestamp":8425,"Mod":0,"Key":256,"Ch":102},{"Timestamp":8513,"Mod":0,"Key":256,"Ch":105},{"Timestamp":8561,"Mod":0,"Key":256,"Ch":108},{"Timestamp":8665,"Mod":0,"Key":256,"Ch":101},{"Timestamp":8858,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9378,"Mod":0,"Key":256,"Ch":110},{"Timestamp":9601,"Mod":0,"Key":256,"Ch":110},{"Timestamp":10155,"Mod":0,"Key":27,"Ch":0},{"Timestamp":10481,"Mod":0,"Key":256,"Ch":32},{"Timestamp":10785,"Mod":0,"Key":256,"Ch":99},{"Timestamp":10993,"Mod":0,"Key":256,"Ch":97},{"Timestamp":11081,"Mod":0,"Key":256,"Ch":115},{"Timestamp":11129,"Mod":0,"Key":256,"Ch":100},{"Timestamp":11489,"Mod":0,"Key":13,"Ch":13},{"Timestamp":11889,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":127,"Height":35}]}

test/integration/searching/setup.sh

@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $1
-
-git init
-
-git config user.email "CI@example.com"
-git config user.name "CI"
-
-echo test1 > myfile1
-git add .
-git commit -am "myfile1"
-echo test2 > myfile2
-git add .
-git commit -am "myfile2"
-echo test3 > myfile3
-git add .
-git commit -am "myfile3"
-echo test4 > myfile4
-git add .
-git commit -am "myfile4"
-echo test5 > myfile5

test/integration/searching/test.json

@@ -1 +0,0 @@
-{ "description": "" }

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

@@ -1 +0,0 @@
-asd

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

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

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

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

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

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

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

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

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

@@ -1,2 +0,0 @@
-0000000000000000000000000000000000000000 70dcf03faa734af0278690e1b0f8e767b733d88a CI <CI@example.com> 1617671518 +1000	commit (initial): myfile1
-70dcf03faa734af0278690e1b0f8e767b733d88a 364e6307f708c6f17d83c7309aaf9a3034210236 CI <CI@example.com> 1617671530 +1000	commit: asd

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

@@ -1,2 +0,0 @@
-0000000000000000000000000000000000000000 70dcf03faa734af0278690e1b0f8e767b733d88a CI <CI@example.com> 1617671518 +1000	commit (initial): myfile1
-70dcf03faa734af0278690e1b0f8e767b733d88a 364e6307f708c6f17d83c7309aaf9a3034210236 CI <CI@example.com> 1617671530 +1000	commit: asd

test/integration/searchingInStagingPanel/expected/repo/.git_keep/objects/70/dcf03faa734af0278690e1b0f8e767b733d88a

@@ -1,2 +0,0 @@
-x
<01><>A
-<EFBFBD> @Ѯ=<3D><>eF<65>c<EFBFBD><63>BV9<56>TG<1A><18><><EFBFBD><EFBFBD><EFBFBD><11><><<3C><>պt .}W<05>B<EFBFBD>N<EFBFBD><4E><EFBFBD><EFBFBD>f<16><14>[<5B>1<EFBFBD>EW^Q<>3<EFBFBD><33><EFBFBD><EFBFBD><EFBFBD>4<EFBFBD>c<EFBFBD><63>zH<7A>V<EFBFBD><56>VG<56>@<1C><06>p%D4g=']<5D><><EFBFBD>~˲*<2A>A,<2C>

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

@@ -1 +0,0 @@
-364e6307f708c6f17d83c7309aaf9a3034210236

test/integration/searchingInStagingPanel/expected/repo/myfile1

@@ -1,4 +0,0 @@
-line 1
-line 2
-line 3
-line 4

test/integration/searchingInStagingPanel/recording.json

@@ -1 +0,0 @@
-{"KeyEvents":[{"Timestamp":635,"Mod":0,"Key":13,"Ch":13},{"Timestamp":1379,"Mod":0,"Key":256,"Ch":47},{"Timestamp":1683,"Mod":0,"Key":256,"Ch":108},{"Timestamp":1707,"Mod":0,"Key":256,"Ch":105},{"Timestamp":1739,"Mod":0,"Key":256,"Ch":110},{"Timestamp":1812,"Mod":0,"Key":256,"Ch":101},{"Timestamp":1884,"Mod":0,"Key":256,"Ch":32},{"Timestamp":2003,"Mod":0,"Key":256,"Ch":51},{"Timestamp":2172,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2532,"Mod":0,"Key":256,"Ch":32},{"Timestamp":3621,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4209,"Mod":0,"Key":27,"Ch":0},{"Timestamp":4723,"Mod":0,"Key":257,"Ch":0},{"Timestamp":5004,"Mod":0,"Key":256,"Ch":32},{"Timestamp":5188,"Mod":0,"Key":257,"Ch":0},{"Timestamp":5636,"Mod":0,"Key":258,"Ch":0},{"Timestamp":5923,"Mod":0,"Key":256,"Ch":32},{"Timestamp":7412,"Mod":0,"Key":256,"Ch":47},{"Timestamp":8027,"Mod":0,"Key":256,"Ch":108},{"Timestamp":8060,"Mod":0,"Key":256,"Ch":105},{"Timestamp":8084,"Mod":0,"Key":256,"Ch":110},{"Timestamp":8139,"Mod":0,"Key":256,"Ch":101},{"Timestamp":8228,"Mod":0,"Key":256,"Ch":32},{"Timestamp":8315,"Mod":0,"Key":256,"Ch":52},{"Timestamp":8556,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8915,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9622,"Mod":0,"Key":27,"Ch":0},{"Timestamp":10414,"Mod":0,"Key":27,"Ch":0},{"Timestamp":11140,"Mod":0,"Key":256,"Ch":99},{"Timestamp":11419,"Mod":0,"Key":256,"Ch":97},{"Timestamp":11500,"Mod":0,"Key":256,"Ch":115},{"Timestamp":11580,"Mod":0,"Key":256,"Ch":100},{"Timestamp":11813,"Mod":0,"Key":13,"Ch":13},{"Timestamp":12276,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":127,"Height":35}]}

test/integration/searchingInStagingPanel/setup.sh

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $1
-
-git init
-
-git config user.email "CI@example.com"
-git config user.name "CI"
-
-echo "line 1" > myfile1
-git add .
-git commit -am "myfile1"
-
-echo "line 2" >> myfile1
-echo "line 3" >> myfile1
-echo "line 4" >> myfile1

test/integration/searchingInStagingPanel/test.json

@@ -1 +0,0 @@
-{ "description": "" }

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

@@ -1 +0,0 @@
-myfile3

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

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

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

@@ -1,10 +0,0 @@
-[core]
-	repositoryformatversion = 0
-	filemode = true
-	bare = false
-	logallrefupdates = true
-	ignorecase = true
-	precomposeunicode = true
-[user]
-	email = Author2@example.com
-	name = Author2

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

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

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

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

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

@@ -1,4 +0,0 @@
-0000000000000000000000000000000000000000 2075aeb39a2a66a9607860a65b2a71c517760254 Author1 <Author1@example.com> 1652008089 +1000	commit (initial): myfile1
-2075aeb39a2a66a9607860a65b2a71c517760254 d01c8bb001458d0a7c01193813685c658e0355ac Author1 <Author1@example.com> 1652008089 +1000	commit: myfile2
-d01c8bb001458d0a7c01193813685c658e0355ac 8710ece70b7db9638b9645e93abdbcf210fa4595 Author2 <Author2@example.com> 1652008089 +1000	commit: myfile3
-8710ece70b7db9638b9645e93abdbcf210fa4595 baf3189129ba8878ba9b4107eaaaf3389287259b Author2 <Author2@example.com> 1652008097 +1000	commit (amend): myfile3

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

@@ -1,4 +0,0 @@
-0000000000000000000000000000000000000000 2075aeb39a2a66a9607860a65b2a71c517760254 Author1 <Author1@example.com> 1652008089 +1000	commit (initial): myfile1
-2075aeb39a2a66a9607860a65b2a71c517760254 d01c8bb001458d0a7c01193813685c658e0355ac Author1 <Author1@example.com> 1652008089 +1000	commit: myfile2
-d01c8bb001458d0a7c01193813685c658e0355ac 8710ece70b7db9638b9645e93abdbcf210fa4595 Author2 <Author2@example.com> 1652008089 +1000	commit: myfile3
-8710ece70b7db9638b9645e93abdbcf210fa4595 baf3189129ba8878ba9b4107eaaaf3389287259b Author2 <Author2@example.com> 1652008097 +1000	commit (amend): myfile3