diff --git a/.vscode/tasks.json b/.vscode/tasks.json index f0d10c7e4..f020e1d0c 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -24,7 +24,7 @@ { "label": "Run current file integration test", "type": "shell", - "command": "go run cmd/integration_test/main.go cli ${relativeFile}", + "command": "go generate pkg/integration/tests/tests.go && go run cmd/integration_test/main.go cli ${relativeFile}", "problemMatcher": [], "group": { "kind": "test", @@ -37,7 +37,7 @@ { "label": "Run current file integration test (slow)", "type": "shell", - "command": "go run cmd/integration_test/main.go cli --slow ${relativeFile}", + "command": "go generate pkg/integration/tests/tests.go && go run cmd/integration_test/main.go cli --slow ${relativeFile}", "problemMatcher": [], "group": { "kind": "test", @@ -49,7 +49,7 @@ { "label": "Run current file integration test (sandbox)", "type": "shell", - "command": "go run cmd/integration_test/main.go cli --sandbox ${relativeFile}", + "command": "go generate pkg/integration/tests/tests.go && go run cmd/integration_test/main.go cli --sandbox ${relativeFile}", "problemMatcher": [], "group": { "kind": "test", @@ -73,7 +73,7 @@ { "label": "Sync tests list", "type": "shell", - "command": "go generate ./...", + "command": "go generate pkg/integration/tests/tests.go", "problemMatcher": [], "group": { "kind": "test", diff --git a/pkg/commands/git_commands/tag_loader.go b/pkg/commands/git_commands/tag_loader.go index 738283405..2dc5a4f41 100644 --- a/pkg/commands/git_commands/tag_loader.go +++ b/pkg/commands/git_commands/tag_loader.go @@ -1,6 +1,8 @@ package git_commands import ( + "regexp" + "github.com/jesseduffield/generics/slices" "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/commands/oscommands" @@ -26,16 +28,26 @@ func NewTagLoader( func (self *TagLoader) GetTags() ([]*models.Tag, error) { // get remote branches, sorted by creation date (descending) // see: https://git-scm.com/docs/git-tag#Documentation/git-tag.txt---sortltkeygt - tagsOutput, err := self.cmd.New(`git tag --list --sort=-creatordate`).DontLog().RunWithOutput() + tagsOutput, err := self.cmd.New(`git tag --list -n --sort=-creatordate`).DontLog().RunWithOutput() if err != nil { return nil, err } split := utils.SplitLines(tagsOutput) - tags := slices.Map(split, func(tagName string) *models.Tag { + lineRegex := regexp.MustCompile(`^([^\s]+)(\s+)?(.*)$`) + + tags := slices.Map(split, func(line string) *models.Tag { + matches := lineRegex.FindStringSubmatch(line) + tagName := matches[1] + message := "" + if len(matches) > 3 { + message = matches[3] + } + return &models.Tag{ - Name: tagName, + Name: tagName, + Message: message, } }) diff --git a/pkg/commands/git_commands/tag_loader_test.go b/pkg/commands/git_commands/tag_loader_test.go index f8696cafa..61b55d018 100644 --- a/pkg/commands/git_commands/tag_loader_test.go +++ b/pkg/commands/git_commands/tag_loader_test.go @@ -9,12 +9,9 @@ import ( "github.com/stretchr/testify/assert" ) -const tagsOutput = `v0.34 -v0.33 -v0.32.2 -v0.32.1 -v0.32 -testtag +const tagsOutput = `tag1 this is my message +tag2 +tag3 this is my other message ` func TestGetTags(t *testing.T) { @@ -29,21 +26,18 @@ func TestGetTags(t *testing.T) { { testName: "should return no tags if there are none", runner: oscommands.NewFakeRunner(t). - Expect(`git tag --list --sort=-creatordate`, "", nil), + Expect(`git tag --list -n --sort=-creatordate`, "", nil), expectedTags: []*models.Tag{}, expectedError: nil, }, { testName: "should return tags if present", runner: oscommands.NewFakeRunner(t). - Expect(`git tag --list --sort=-creatordate`, tagsOutput, nil), + Expect(`git tag --list -n --sort=-creatordate`, tagsOutput, nil), expectedTags: []*models.Tag{ - {Name: "v0.34"}, - {Name: "v0.33"}, - {Name: "v0.32.2"}, - {Name: "v0.32.1"}, - {Name: "v0.32"}, - {Name: "testtag"}, + {Name: "tag1", Message: "this is my message"}, + {Name: "tag2", Message: ""}, + {Name: "tag3", Message: "this is my other message"}, }, expectedError: nil, }, diff --git a/pkg/commands/models/tag.go b/pkg/commands/models/tag.go index 25d8754f5..ab6076a7a 100644 --- a/pkg/commands/models/tag.go +++ b/pkg/commands/models/tag.go @@ -3,6 +3,9 @@ package models // Tag : A git tag type Tag struct { Name string + // this is either the first line of the message of an annotated tag, or the + // first line of a commit message for a lightweight tag + Message string } func (t *Tag) FullRefName() string { @@ -22,5 +25,5 @@ func (t *Tag) ID() string { } func (t *Tag) Description() string { - return "tag " + t.Name + return t.Message } diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go index d9e736149..6fe880ce2 100644 --- a/pkg/config/user_config.go +++ b/pkg/config/user_config.go @@ -258,7 +258,7 @@ type KeybindingCommitsConfig struct { CherryPickCopy string `yaml:"cherryPickCopy"` CherryPickCopyRange string `yaml:"cherryPickCopyRange"` PasteCommits string `yaml:"pasteCommits"` - TagCommit string `yaml:"tagCommit"` + CreateTag string `yaml:"tagCommit"` CheckoutCommit string `yaml:"checkoutCommit"` ResetCherryPick string `yaml:"resetCherryPick"` CopyCommitAttributeToClipboard string `yaml:"copyCommitAttributeToClipboard"` @@ -544,7 +544,7 @@ func GetDefaultConfig() *UserConfig { CherryPickCopy: "c", CherryPickCopyRange: "C", PasteCommits: "v", - TagCommit: "T", + CreateTag: "T", CheckoutCommit: "", ResetCherryPick: "", CopyCommitAttributeToClipboard: "y", diff --git a/pkg/gui/controllers/local_commits_controller.go b/pkg/gui/controllers/local_commits_controller.go index a9fe7a190..ae0f342fb 100644 --- a/pkg/gui/controllers/local_commits_controller.go +++ b/pkg/gui/controllers/local_commits_controller.go @@ -132,7 +132,7 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [ Description: self.c.Tr.LcRevertCommit, }, { - Key: opts.GetKey(opts.Config.Commits.TagCommit), + Key: opts.GetKey(opts.Config.Commits.CreateTag), Handler: self.checkSelected(self.createTag), Description: self.c.Tr.LcTagCommit, }, diff --git a/pkg/gui/presentation/tags.go b/pkg/gui/presentation/tags.go index 2996db18d..944448a8c 100644 --- a/pkg/gui/presentation/tags.go +++ b/pkg/gui/presentation/tags.go @@ -4,6 +4,7 @@ import ( "github.com/jesseduffield/generics/slices" "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/gui/presentation/icons" + "github.com/jesseduffield/lazygit/pkg/gui/style" "github.com/jesseduffield/lazygit/pkg/theme" ) @@ -24,6 +25,7 @@ func getTagDisplayStrings(t *models.Tag, diffed bool) []string { if icons.IsIconEnabled() { res = append(res, textStyle.Sprint(icons.IconForTag(t))) } - res = append(res, textStyle.Sprint(t.Name)) + descriptionColor := style.FgYellow + res = append(res, textStyle.Sprint(t.Name), descriptionColor.Sprint(t.Description())) return res } diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 06ffd9b1c..808e7af86 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -985,7 +985,7 @@ func EnglishTranslationSet() TranslationSet { LcTagCommit: "tag commit", TagMenuTitle: "Create tag", TagNameTitle: "Tag name:", - TagMessageTitle: "Tag message: ", + TagMessageTitle: "Tag message:", LcAnnotatedTag: "annotated tag", LcLightweightTag: "lightweight tag", LcDeleteTag: "delete tag", diff --git a/pkg/integration/components/shell.go b/pkg/integration/components/shell.go index ad4964507..ad6d195f5 100644 --- a/pkg/integration/components/shell.go +++ b/pkg/integration/components/shell.go @@ -136,6 +136,10 @@ func (self *Shell) EmptyCommit(message string) *Shell { return self.RunCommand(fmt.Sprintf("git commit --allow-empty -m \"%s\"", message)) } +func (self *Shell) CreateLightweightTag(name string, ref string) *Shell { + return self.RunCommand(fmt.Sprintf("git tag %s %s", name, ref)) +} + // convenience method for creating a file and adding it func (self *Shell) CreateFileAndAdd(fileName string, fileContents string) *Shell { return self. diff --git a/pkg/integration/tests/branch/create_tag.go b/pkg/integration/tests/branch/create_tag.go index 6f4ec0baf..36df00f60 100644 --- a/pkg/integration/tests/branch/create_tag.go +++ b/pkg/integration/tests/branch/create_tag.go @@ -28,6 +28,7 @@ var CreateTag = NewIntegrationTest(NewIntegrationTestArgs{ t.ExpectPopup().Menu(). Title(Equals("Create tag")). + Select(Contains("lightweight")). Confirm() t.ExpectPopup().Prompt(). diff --git a/pkg/integration/tests/commit/commit.go b/pkg/integration/tests/commit/commit.go index 6ed75a797..741a1da99 100644 --- a/pkg/integration/tests/commit/commit.go +++ b/pkg/integration/tests/commit/commit.go @@ -20,18 +20,42 @@ var Commit = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Files(). IsFocused(). + Lines( + Contains("?? myfile").IsSelected(), + Contains("?? myfile2"), + ). PressPrimaryAction(). // stage file + Lines( + Contains("A myfile").IsSelected(), + Contains("?? myfile2"), + ). SelectNextItem(). PressPrimaryAction(). // stage other file + Lines( + Contains("A myfile"), + Contains("A myfile2").IsSelected(), + ). Press(keys.Files.CommitChanges) commitMessage := "my commit message" t.ExpectPopup().CommitMessagePanel().Type(commitMessage).Confirm() + t.Views().Files(). + IsEmpty() + t.Views().Commits(). + Focus(). Lines( - Contains(commitMessage), + Contains(commitMessage).IsSelected(), + ). + PressEnter() + + t.Views().CommitFiles(). + IsFocused(). + Lines( + Contains("A myfile"), + Contains("A myfile2"), ) }, }) diff --git a/pkg/integration/tests/commit/create_tag.go b/pkg/integration/tests/commit/create_tag.go new file mode 100644 index 000000000..4b749b235 --- /dev/null +++ b/pkg/integration/tests/commit/create_tag.go @@ -0,0 +1,51 @@ +package commit + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var CreateTag = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Create a new tag on a commit", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + shell.EmptyCommit("two") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Lines( + Contains("two").IsSelected(), + Contains("one"), + ). + Press(keys.Commits.CreateTag) + + t.ExpectPopup().Menu(). + Title(Equals("Create tag")). + Select(Contains("lightweight")). + Confirm() + + t.ExpectPopup().Prompt(). + Title(Equals("Tag name:")). + Type("new-tag"). + Confirm() + + t.Views().Commits(). + Lines( + MatchesRegexp(`new-tag.*two`).IsSelected(), + MatchesRegexp(`one`), + ) + + t.Views().Tags(). + Focus(). + Lines( + MatchesRegexp(`new-tag.*two`).IsSelected(), + ) + + t.Git(). + TagNamesAt("HEAD", []string{"new-tag"}) + }, +}) diff --git a/pkg/integration/tests/tag/checkout.go b/pkg/integration/tests/tag/checkout.go new file mode 100644 index 000000000..9ed88f980 --- /dev/null +++ b/pkg/integration/tests/tag/checkout.go @@ -0,0 +1,31 @@ +package tag + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var Checkout = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Checkout a tag", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + shell.EmptyCommit("two") + shell.CreateLightweightTag("tag", "HEAD^") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Tags(). + Focus(). + Lines( + Contains("tag").IsSelected(), + ). + PressPrimaryAction() // checkout tag + + t.Views().Branches().IsFocused().Lines( + Contains("HEAD detached at tag").IsSelected(), + Contains("master"), + ) + }, +}) diff --git a/pkg/integration/tests/tag/crud_annotated.go b/pkg/integration/tests/tag/crud_annotated.go new file mode 100644 index 000000000..f690fdce3 --- /dev/null +++ b/pkg/integration/tests/tag/crud_annotated.go @@ -0,0 +1,49 @@ +package tag + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var CrudAnnotated = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Create and delete an annotated tag in the tags panel", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("initial commit") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Tags(). + Focus(). + IsEmpty(). + Press(keys.Universal.New). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Equals("Create tag")). + Select(Contains("annotated")). + Confirm() + + t.ExpectPopup().Prompt(). + Title(Equals("Tag name:")). + Type("new-tag"). + Confirm() + + t.ExpectPopup().Prompt(). + Title(Equals("Tag message:")). + Type("message"). + Confirm() + }). + Lines( + MatchesRegexp(`new-tag.*message`).IsSelected(), + ). + Press(keys.Universal.Remove). + Tap(func() { + t.ExpectPopup().Confirmation(). + Title(Equals("Delete tag")). + Content(Equals("Are you sure you want to delete tag 'new-tag'?")). + Confirm() + }). + IsEmpty() + }, +}) diff --git a/pkg/integration/tests/tag/crud_lightweight.go b/pkg/integration/tests/tag/crud_lightweight.go new file mode 100644 index 000000000..f76157038 --- /dev/null +++ b/pkg/integration/tests/tag/crud_lightweight.go @@ -0,0 +1,53 @@ +package tag + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var CrudLightweight = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Create and delete a lightweight tag in the tags panel", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("initial commit") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Tags(). + Focus(). + IsEmpty(). + Press(keys.Universal.New). + Tap(func() { + t.ExpectPopup().Menu(). + Title(Equals("Create tag")). + Select(Contains("lightweight")). + Confirm() + + t.ExpectPopup().Prompt(). + Title(Equals("Tag name:")). + Type("new-tag"). + Confirm() + }). + Lines( + MatchesRegexp(`new-tag.*initial commit`).IsSelected(), + ). + PressEnter(). + Tap(func() { + // view the commits of the tag + t.Views().SubCommits().IsFocused(). + Lines( + Contains("initial commit"), + ). + PressEscape() + }). + Press(keys.Universal.Remove). + Tap(func() { + t.ExpectPopup().Confirmation(). + Title(Equals("Delete tag")). + Content(Equals("Are you sure you want to delete tag 'new-tag'?")). + Confirm() + }). + IsEmpty() + }, +}) diff --git a/pkg/integration/tests/tag/reset.go b/pkg/integration/tests/tag/reset.go new file mode 100644 index 000000000..1e2a9402b --- /dev/null +++ b/pkg/integration/tests/tag/reset.go @@ -0,0 +1,40 @@ +package tag + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var Reset = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Hard reset to a tag", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + shell.EmptyCommit("two") + shell.CreateLightweightTag("tag", "HEAD^") // creating tag on commit "one" + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits().Lines( + Contains("two"), + Contains("one"), + ) + + t.Views().Tags(). + Focus(). + Lines( + Contains("tag").IsSelected(), + ). + Press(keys.Commits.ViewResetOptions) + + t.ExpectPopup().Menu(). + Title(Contains("reset to tag")). + Select(Contains("hard reset")). + Confirm() + + t.Views().Commits().Lines( + Contains("one"), + ) + }, +}) diff --git a/pkg/integration/tests/tests_gen.go b/pkg/integration/tests/tests_gen.go index 5d831900e..e2336f6be 100644 --- a/pkg/integration/tests/tests_gen.go +++ b/pkg/integration/tests/tests_gen.go @@ -20,6 +20,7 @@ import ( "github.com/jesseduffield/lazygit/pkg/integration/tests/stash" "github.com/jesseduffield/lazygit/pkg/integration/tests/submodule" "github.com/jesseduffield/lazygit/pkg/integration/tests/sync" + "github.com/jesseduffield/lazygit/pkg/integration/tests/tag" "github.com/jesseduffield/lazygit/pkg/integration/tests/undo" ) @@ -40,6 +41,7 @@ var tests = []*components.IntegrationTest{ cherry_pick.CherryPickConflicts, commit.Commit, commit.CommitMultiline, + commit.CreateTag, commit.DiscardOldFileChange, commit.NewBranch, commit.Revert, @@ -85,5 +87,10 @@ var tests = []*components.IntegrationTest{ sync.Pull, sync.PullAndSetUpstream, sync.RenameBranchAndPull, + tag.Checkout, + tag.CrudAnnotated, + tag.CrudLightweight, + tag.Reset, + undo.UndoCheckoutAndDrop, undo.UndoDrop, } diff --git a/pkg/integration/tests/undo/undo_checkout_and_drop.go b/pkg/integration/tests/undo/undo_checkout_and_drop.go new file mode 100644 index 000000000..b953c2528 --- /dev/null +++ b/pkg/integration/tests/undo/undo_checkout_and_drop.go @@ -0,0 +1,151 @@ +package undo + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var UndoCheckoutAndDrop = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Drop some commits and then undo/redo the actions", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("one") + shell.EmptyCommit("two") + shell.EmptyCommit("three") + shell.EmptyCommit("four") + + shell.NewBranch("other_branch") + shell.Checkout("master") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + // we're going to drop a commit, switch branch, drop a commit there, then undo everything, then redo everything. + + confirmCommitDrop := func() { + t.ExpectPopup().Confirmation(). + Title(Equals("Delete Commit")). + Content(Equals("Are you sure you want to delete this commit?")). + Confirm() + } + + confirmUndoDrop := func() { + t.ExpectPopup().Confirmation(). + Title(Equals("Undo")). + Content(MatchesRegexp(`Are you sure you want to hard reset to '.*'\? An auto-stash will be performed if necessary\.`)). + Confirm() + } + + confirmRedoDrop := func() { + t.ExpectPopup().Confirmation(). + Title(Equals("Redo")). + Content(MatchesRegexp(`Are you sure you want to hard reset to '.*'\? An auto-stash will be performed if necessary\.`)). + Confirm() + } + + t.Views().Commits().Focus(). + Lines( + Contains("four").IsSelected(), + Contains("three"), + Contains("two"), + Contains("one"), + ). + Press(keys.Universal.Remove). + Tap(confirmCommitDrop). + Lines( + Contains("three").IsSelected(), + Contains("two"), + Contains("one"), + ) + + t.Views().Branches().Focus(). + Lines( + Contains("master").IsSelected(), + Contains("other_branch"), + ). + SelectNextItem(). + // checkout branch + PressPrimaryAction(). + Lines( + Contains("other_branch").IsSelected(), + Contains("master"), + ) + + // drop the commit in the 'other_branch' branch too + t.Views().Commits().Focus(). + Lines( + Contains("four").IsSelected(), + Contains("three"), + Contains("two"), + Contains("one"), + ). + Press(keys.Universal.Remove). + Tap(confirmCommitDrop). + Lines( + Contains("three").IsSelected(), + Contains("two"), + Contains("one"), + ). + Press(keys.Universal.Undo). + Tap(confirmUndoDrop). + Lines( + Contains("four").IsSelected(), + Contains("three"), + Contains("two"), + Contains("one"), + ). + Press(keys.Universal.Undo). + Tap(func() { + t.ExpectPopup().Confirmation(). + Title(Equals("Undo")). + Content(Contains("Are you sure you want to checkout 'master'?")). + Confirm() + + t.Views().Branches(). + Lines( + Contains("master").IsSelected(), + Contains("other_branch"), + ) + }). + Lines( + Contains("three").IsSelected(), + Contains("two"), + Contains("one"), + ). + Press(keys.Universal.Undo). + Tap(confirmUndoDrop). + Lines( + Contains("four").IsSelected(), + Contains("three"), + Contains("two"), + Contains("one"), + ). + Press(keys.Universal.Redo). + Tap(confirmRedoDrop). + Lines( + Contains("three").IsSelected(), + Contains("two"), + Contains("one"), + ). + Press(keys.Universal.Redo). + Tap(func() { + t.ExpectPopup().Confirmation(). + Title(Equals("Redo")). + Content(Contains("Are you sure you want to checkout 'other_branch'?")). + Confirm() + + t.Views().Branches(). + Lines( + Contains("other_branch").IsSelected(), + Contains("master"), + ) + }). + Press(keys.Universal.Redo). + Tap(confirmRedoDrop). + Lines( + Contains("three").IsSelected(), + Contains("two"), + Contains("one"), + ) + }, +}) diff --git a/test/integration/tags/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/tags/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index e2129701f..000000000 --- a/test/integration/tags/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -file1 diff --git a/test/integration/tags/expected/repo/.git_keep/FETCH_HEAD b/test/integration/tags/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/tags/expected/repo/.git_keep/HEAD b/test/integration/tags/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/tags/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/tags/expected/repo/.git_keep/config b/test/integration/tags/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/tags/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/tags/expected/repo/.git_keep/description b/test/integration/tags/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/tags/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/tags/expected/repo/.git_keep/index b/test/integration/tags/expected/repo/.git_keep/index deleted file mode 100644 index 8112f33fc..000000000 Binary files a/test/integration/tags/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/tags/expected/repo/.git_keep/info/exclude b/test/integration/tags/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/tags/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/tags/expected/repo/.git_keep/logs/HEAD b/test/integration/tags/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index fafa3e62d..000000000 --- a/test/integration/tags/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 3e46e87f3ca37fad40d7dd6aca00223d7f49e424 CI 1631477191 -0300 commit (initial): file0 -3e46e87f3ca37fad40d7dd6aca00223d7f49e424 07b4cadb018ce914237e3f31ee264c9555acc1d1 CI 1631477191 -0300 commit: file1 diff --git a/test/integration/tags/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/tags/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index fafa3e62d..000000000 --- a/test/integration/tags/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 3e46e87f3ca37fad40d7dd6aca00223d7f49e424 CI 1631477191 -0300 commit (initial): file0 -3e46e87f3ca37fad40d7dd6aca00223d7f49e424 07b4cadb018ce914237e3f31ee264c9555acc1d1 CI 1631477191 -0300 commit: file1 diff --git a/test/integration/tags/expected/repo/.git_keep/objects/07/b4cadb018ce914237e3f31ee264c9555acc1d1 b/test/integration/tags/expected/repo/.git_keep/objects/07/b4cadb018ce914237e3f31ee264c9555acc1d1 deleted file mode 100644 index a1fbbc541..000000000 Binary files a/test/integration/tags/expected/repo/.git_keep/objects/07/b4cadb018ce914237e3f31ee264c9555acc1d1 and /dev/null differ diff --git a/test/integration/tags/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/tags/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67..000000000 Binary files a/test/integration/tags/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 and /dev/null differ diff --git a/test/integration/tags/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/tags/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d..000000000 Binary files a/test/integration/tags/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da and /dev/null differ diff --git a/test/integration/tags/expected/repo/.git_keep/objects/3e/46e87f3ca37fad40d7dd6aca00223d7f49e424 b/test/integration/tags/expected/repo/.git_keep/objects/3e/46e87f3ca37fad40d7dd6aca00223d7f49e424 deleted file mode 100644 index 7c9547938..000000000 --- a/test/integration/tags/expected/repo/.git_keep/objects/3e/46e87f3ca37fad40d7dd6aca00223d7f49e424 +++ /dev/null @@ -1,2 +0,0 @@ -xɮ@E+zo%4$ -`aG3?Ɔ(,RˣҽIfԧy2@dTư{S" r:$JshI,~e7I_%G۾ɾ$] E,K )7}}1UkDYl4,@媛($R2iy B"ؗcUeVVݒD1 {>uPVvmQ)Q\"qLVp7]D5ͩ|V#J,B̕ :7WkգhgˢTvEY/!#H1vJVӵ`2z\P5 VC{oqQO!{rnhDVL)rժm21Z熩%C!8/LVZ^WfẎ+7wOA-e|<&>د:\I].q>jӡզx{KC[Za3sd!j) lư-nnC5[a_!{4:C|7 Ѥa$:PMp2ISφe]7|R;CTw|LIGtF͉d"F{'⥶#e/j2AK \ No newline at end of file diff --git a/test/integration/tags/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/tags/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/tags/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/tags/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/tags/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/tags/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/tags/expected/repo/.git_keep/packed-refs b/test/integration/tags/expected/repo/.git_keep/packed-refs deleted file mode 100644 index 250f18738..000000000 --- a/test/integration/tags/expected/repo/.git_keep/packed-refs +++ /dev/null @@ -1 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted diff --git a/test/integration/tags/expected/repo/.git_keep/refs/heads/master b/test/integration/tags/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 5fe2e1847..000000000 --- a/test/integration/tags/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -07b4cadb018ce914237e3f31ee264c9555acc1d1 diff --git a/test/integration/tags/expected/repo/.git_keep/refs/tags/tag1 b/test/integration/tags/expected/repo/.git_keep/refs/tags/tag1 deleted file mode 100644 index 5fe2e1847..000000000 --- a/test/integration/tags/expected/repo/.git_keep/refs/tags/tag1 +++ /dev/null @@ -1 +0,0 @@ -07b4cadb018ce914237e3f31ee264c9555acc1d1 diff --git a/test/integration/tags/expected/repo/.git_keep/refs/tags/tag3 b/test/integration/tags/expected/repo/.git_keep/refs/tags/tag3 deleted file mode 100644 index 5fe2e1847..000000000 --- a/test/integration/tags/expected/repo/.git_keep/refs/tags/tag3 +++ /dev/null @@ -1 +0,0 @@ -07b4cadb018ce914237e3f31ee264c9555acc1d1 diff --git a/test/integration/tags/expected/repo/.git_keep/refs/tags/tag4 b/test/integration/tags/expected/repo/.git_keep/refs/tags/tag4 deleted file mode 100644 index 34a63fe68..000000000 --- a/test/integration/tags/expected/repo/.git_keep/refs/tags/tag4 +++ /dev/null @@ -1 +0,0 @@ -3e46e87f3ca37fad40d7dd6aca00223d7f49e424 diff --git a/test/integration/tags/expected/repo/file0 b/test/integration/tags/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/tags/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/tags/expected/repo/file1 b/test/integration/tags/expected/repo/file1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/tags/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/tags/recording.json b/test/integration/tags/recording.json deleted file mode 100644 index 2388dddb9..000000000 --- a/test/integration/tags/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":2009,"Mod":0,"Key":256,"Ch":52},{"Timestamp":2895,"Mod":0,"Key":256,"Ch":84},{"Timestamp":3851,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4233,"Mod":0,"Key":256,"Ch":116},{"Timestamp":4248,"Mod":0,"Key":256,"Ch":97},{"Timestamp":4436,"Mod":0,"Key":256,"Ch":103},{"Timestamp":4618,"Mod":0,"Key":256,"Ch":49},{"Timestamp":4751,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7572,"Mod":0,"Key":256,"Ch":84},{"Timestamp":7946,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8457,"Mod":0,"Key":256,"Ch":116},{"Timestamp":8491,"Mod":0,"Key":256,"Ch":97},{"Timestamp":8665,"Mod":0,"Key":256,"Ch":103},{"Timestamp":8884,"Mod":0,"Key":256,"Ch":51},{"Timestamp":9219,"Mod":0,"Key":13,"Ch":13},{"Timestamp":13521,"Mod":0,"Key":256,"Ch":84},{"Timestamp":15106,"Mod":0,"Key":13,"Ch":13},{"Timestamp":15579,"Mod":0,"Key":256,"Ch":116},{"Timestamp":15604,"Mod":0,"Key":256,"Ch":97},{"Timestamp":15858,"Mod":0,"Key":256,"Ch":103},{"Timestamp":16298,"Mod":0,"Key":256,"Ch":50},{"Timestamp":16600,"Mod":0,"Key":13,"Ch":13},{"Timestamp":19216,"Mod":0,"Key":258,"Ch":0},{"Timestamp":19753,"Mod":0,"Key":256,"Ch":84},{"Timestamp":20673,"Mod":0,"Key":13,"Ch":13},{"Timestamp":20918,"Mod":0,"Key":256,"Ch":116},{"Timestamp":20990,"Mod":0,"Key":256,"Ch":97},{"Timestamp":21124,"Mod":0,"Key":256,"Ch":103},{"Timestamp":21361,"Mod":0,"Key":256,"Ch":52},{"Timestamp":22463,"Mod":0,"Key":13,"Ch":13},{"Timestamp":23552,"Mod":0,"Key":256,"Ch":51},{"Timestamp":23909,"Mod":0,"Key":256,"Ch":93},{"Timestamp":24078,"Mod":0,"Key":256,"Ch":93},{"Timestamp":25170,"Mod":0,"Key":258,"Ch":0},{"Timestamp":25510,"Mod":0,"Key":256,"Ch":100},{"Timestamp":26316,"Mod":0,"Key":13,"Ch":13},{"Timestamp":28199,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":131,"Height":42}]} \ No newline at end of file diff --git a/test/integration/tags/setup.sh b/test/integration/tags/setup.sh deleted file mode 100644 index e878a9ed5..000000000 --- a/test/integration/tags/setup.sh +++ /dev/null @@ -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 test0 > file0 -git add . -git commit -am file0 - -echo test1 > file1 -git add . -git commit -am file1 diff --git a/test/integration/tags/test.json b/test/integration/tags/test.json deleted file mode 100644 index 4d1d46ee2..000000000 --- a/test/integration/tags/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "basic CRUD for tags", "speed": 5 } diff --git a/test/integration/tags2/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/tags2/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index bfd6a6583..000000000 --- a/test/integration/tags2/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -file4 diff --git a/test/integration/tags2/expected/repo/.git_keep/FETCH_HEAD b/test/integration/tags2/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/tags2/expected/repo/.git_keep/HEAD b/test/integration/tags2/expected/repo/.git_keep/HEAD deleted file mode 100644 index 1adee3887..000000000 --- a/test/integration/tags2/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -aefe968910ad84a58bfac631b56eb422968766fb diff --git a/test/integration/tags2/expected/repo/.git_keep/ORIG_HEAD b/test/integration/tags2/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 1adee3887..000000000 --- a/test/integration/tags2/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -aefe968910ad84a58bfac631b56eb422968766fb diff --git a/test/integration/tags2/expected/repo/.git_keep/config b/test/integration/tags2/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/tags2/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/tags2/expected/repo/.git_keep/description b/test/integration/tags2/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/tags2/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/tags2/expected/repo/.git_keep/index b/test/integration/tags2/expected/repo/.git_keep/index deleted file mode 100644 index 6125b7d75..000000000 Binary files a/test/integration/tags2/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/tags2/expected/repo/.git_keep/info/exclude b/test/integration/tags2/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/tags2/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/tags2/expected/repo/.git_keep/logs/HEAD b/test/integration/tags2/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 0f088aab5..000000000 --- a/test/integration/tags2/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 dcb11a2a23383bd5f4a1085bf3a64e73e5bd963a CI 1631477400 -0300 commit (initial): file0 -dcb11a2a23383bd5f4a1085bf3a64e73e5bd963a 56a89d6aebdfa4f2d717efc0d115656cc9b602e7 CI 1631477401 -0300 commit: file1 -56a89d6aebdfa4f2d717efc0d115656cc9b602e7 aefe968910ad84a58bfac631b56eb422968766fb CI 1631477401 -0300 commit: file2 -aefe968910ad84a58bfac631b56eb422968766fb 1750e9a4016c985ef97d002ae40ed554e3db6c87 CI 1631477401 -0300 commit: file4 -1750e9a4016c985ef97d002ae40ed554e3db6c87 aefe968910ad84a58bfac631b56eb422968766fb CI 1631477414 -0300 checkout: moving from master to one diff --git a/test/integration/tags2/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/tags2/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index be76b12b4..000000000 --- a/test/integration/tags2/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 dcb11a2a23383bd5f4a1085bf3a64e73e5bd963a CI 1631477400 -0300 commit (initial): file0 -dcb11a2a23383bd5f4a1085bf3a64e73e5bd963a 56a89d6aebdfa4f2d717efc0d115656cc9b602e7 CI 1631477401 -0300 commit: file1 -56a89d6aebdfa4f2d717efc0d115656cc9b602e7 aefe968910ad84a58bfac631b56eb422968766fb CI 1631477401 -0300 commit: file2 -aefe968910ad84a58bfac631b56eb422968766fb 1750e9a4016c985ef97d002ae40ed554e3db6c87 CI 1631477401 -0300 commit: file4 diff --git a/test/integration/tags2/expected/repo/.git_keep/objects/17/50e9a4016c985ef97d002ae40ed554e3db6c87 b/test/integration/tags2/expected/repo/.git_keep/objects/17/50e9a4016c985ef97d002ae40ed554e3db6c87 deleted file mode 100644 index 9a8a3d3dd..000000000 Binary files a/test/integration/tags2/expected/repo/.git_keep/objects/17/50e9a4016c985ef97d002ae40ed554e3db6c87 and /dev/null differ diff --git a/test/integration/tags2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/tags2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/tags2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/tags2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/tags2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67..000000000 Binary files a/test/integration/tags2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 and /dev/null differ diff --git a/test/integration/tags2/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/tags2/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d..000000000 Binary files a/test/integration/tags2/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da and /dev/null differ diff --git a/test/integration/tags2/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 b/test/integration/tags2/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 deleted file mode 100644 index 39b5247e9..000000000 Binary files a/test/integration/tags2/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 and /dev/null differ diff --git a/test/integration/tags2/expected/repo/.git_keep/objects/56/a89d6aebdfa4f2d717efc0d115656cc9b602e7 b/test/integration/tags2/expected/repo/.git_keep/objects/56/a89d6aebdfa4f2d717efc0d115656cc9b602e7 deleted file mode 100644 index 848900716..000000000 Binary files a/test/integration/tags2/expected/repo/.git_keep/objects/56/a89d6aebdfa4f2d717efc0d115656cc9b602e7 and /dev/null differ diff --git a/test/integration/tags2/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/tags2/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06d..000000000 Binary files a/test/integration/tags2/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c and /dev/null differ diff --git a/test/integration/tags2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/tags2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/tags2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/tags2/expected/repo/.git_keep/objects/ae/fe968910ad84a58bfac631b56eb422968766fb b/test/integration/tags2/expected/repo/.git_keep/objects/ae/fe968910ad84a58bfac631b56eb422968766fb deleted file mode 100644 index 58c8a404a..000000000 Binary files a/test/integration/tags2/expected/repo/.git_keep/objects/ae/fe968910ad84a58bfac631b56eb422968766fb and /dev/null differ diff --git a/test/integration/tags2/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/tags2/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/tags2/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/tags2/expected/repo/.git_keep/objects/dc/b11a2a23383bd5f4a1085bf3a64e73e5bd963a b/test/integration/tags2/expected/repo/.git_keep/objects/dc/b11a2a23383bd5f4a1085bf3a64e73e5bd963a deleted file mode 100644 index de87683d5..000000000 Binary files a/test/integration/tags2/expected/repo/.git_keep/objects/dc/b11a2a23383bd5f4a1085bf3a64e73e5bd963a and /dev/null differ diff --git a/test/integration/tags2/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/tags2/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/tags2/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/tags2/expected/repo/.git_keep/refs/heads/master b/test/integration/tags2/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index dae416f06..000000000 --- a/test/integration/tags2/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -1750e9a4016c985ef97d002ae40ed554e3db6c87 diff --git a/test/integration/tags2/expected/repo/.git_keep/refs/tags/one b/test/integration/tags2/expected/repo/.git_keep/refs/tags/one deleted file mode 100644 index 1adee3887..000000000 --- a/test/integration/tags2/expected/repo/.git_keep/refs/tags/one +++ /dev/null @@ -1 +0,0 @@ -aefe968910ad84a58bfac631b56eb422968766fb diff --git a/test/integration/tags2/expected/repo/.git_keep/refs/tags/two b/test/integration/tags2/expected/repo/.git_keep/refs/tags/two deleted file mode 100644 index 079680fa6..000000000 --- a/test/integration/tags2/expected/repo/.git_keep/refs/tags/two +++ /dev/null @@ -1 +0,0 @@ -56a89d6aebdfa4f2d717efc0d115656cc9b602e7 diff --git a/test/integration/tags2/expected/repo/file0 b/test/integration/tags2/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/tags2/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/tags2/expected/repo/file1 b/test/integration/tags2/expected/repo/file1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/tags2/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/tags2/expected/repo/file2 b/test/integration/tags2/expected/repo/file2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/tags2/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/tags2/recording.json b/test/integration/tags2/recording.json deleted file mode 100644 index 49b66b6ea..000000000 --- a/test/integration/tags2/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":325,"Mod":0,"Key":256,"Ch":52},{"Timestamp":688,"Mod":0,"Key":256,"Ch":106},{"Timestamp":1081,"Mod":0,"Key":256,"Ch":84},{"Timestamp":1671,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2002,"Mod":0,"Key":256,"Ch":111},{"Timestamp":2100,"Mod":0,"Key":256,"Ch":110},{"Timestamp":2164,"Mod":0,"Key":256,"Ch":101},{"Timestamp":2243,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2850,"Mod":0,"Key":256,"Ch":106},{"Timestamp":3524,"Mod":0,"Key":256,"Ch":84},{"Timestamp":4057,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4418,"Mod":0,"Key":256,"Ch":116},{"Timestamp":4482,"Mod":0,"Key":256,"Ch":119},{"Timestamp":4509,"Mod":0,"Key":256,"Ch":111},{"Timestamp":4836,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7822,"Mod":0,"Key":256,"Ch":107},{"Timestamp":8408,"Mod":0,"Key":256,"Ch":103},{"Timestamp":10049,"Mod":0,"Key":27,"Ch":0},{"Timestamp":10619,"Mod":0,"Key":256,"Ch":51},{"Timestamp":11391,"Mod":0,"Key":256,"Ch":93},{"Timestamp":11573,"Mod":0,"Key":256,"Ch":93},{"Timestamp":13390,"Mod":0,"Key":256,"Ch":32},{"Timestamp":16819,"Mod":0,"Key":256,"Ch":93},{"Timestamp":16985,"Mod":0,"Key":256,"Ch":93},{"Timestamp":17905,"Mod":0,"Key":256,"Ch":103},{"Timestamp":20817,"Mod":0,"Key":13,"Ch":13},{"Timestamp":25557,"Mod":0,"Key":256,"Ch":50},{"Timestamp":25951,"Mod":0,"Key":256,"Ch":49},{"Timestamp":26265,"Mod":0,"Key":256,"Ch":51},{"Timestamp":26990,"Mod":0,"Key":256,"Ch":91},{"Timestamp":27245,"Mod":0,"Key":256,"Ch":91},{"Timestamp":28363,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":131,"Height":42}]} \ No newline at end of file diff --git a/test/integration/tags2/setup.sh b/test/integration/tags2/setup.sh deleted file mode 100644 index 8806332fd..000000000 --- a/test/integration/tags2/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 test3 > file4 -git add . -git commit -am file4 diff --git a/test/integration/tags2/test.json b/test/integration/tags2/test.json deleted file mode 100644 index 595398f37..000000000 --- a/test/integration/tags2/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "checking out and resetting to tags", "speed": 10 } diff --git a/test/integration/tags3/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/tags3/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index bfd6a6583..000000000 --- a/test/integration/tags3/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -file4 diff --git a/test/integration/tags3/expected/repo/.git_keep/FETCH_HEAD b/test/integration/tags3/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/tags3/expected/repo/.git_keep/HEAD b/test/integration/tags3/expected/repo/.git_keep/HEAD deleted file mode 100644 index cea9d05ed..000000000 --- a/test/integration/tags3/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/test diff --git a/test/integration/tags3/expected/repo/.git_keep/config b/test/integration/tags3/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/tags3/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/tags3/expected/repo/.git_keep/description b/test/integration/tags3/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/tags3/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/tags3/expected/repo/.git_keep/index b/test/integration/tags3/expected/repo/.git_keep/index deleted file mode 100644 index 7bdcb3c68..000000000 Binary files a/test/integration/tags3/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/tags3/expected/repo/.git_keep/info/exclude b/test/integration/tags3/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/tags3/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/tags3/expected/repo/.git_keep/logs/HEAD b/test/integration/tags3/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 51e82779a..000000000 --- a/test/integration/tags3/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 46b4990797fac897fb135dd639a4cad3b0269f2d CI 1631477922 -0300 commit (initial): file0 -46b4990797fac897fb135dd639a4cad3b0269f2d 88d7a40883abd57297127b3777a2a7ec3696c33a CI 1631477922 -0300 commit: file1 -88d7a40883abd57297127b3777a2a7ec3696c33a 08c28e4e15f3de3b024524894d9235dfcdb48c19 CI 1631477922 -0300 commit: file2 -08c28e4e15f3de3b024524894d9235dfcdb48c19 2515eabac6791725f4a3326676a1491f09664afc CI 1631477922 -0300 commit: file4 -2515eabac6791725f4a3326676a1491f09664afc 88d7a40883abd57297127b3777a2a7ec3696c33a CI 1631477929 -0300 checkout: moving from master to test diff --git a/test/integration/tags3/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/tags3/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 313c3bbc0..000000000 --- a/test/integration/tags3/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 46b4990797fac897fb135dd639a4cad3b0269f2d CI 1631477922 -0300 commit (initial): file0 -46b4990797fac897fb135dd639a4cad3b0269f2d 88d7a40883abd57297127b3777a2a7ec3696c33a CI 1631477922 -0300 commit: file1 -88d7a40883abd57297127b3777a2a7ec3696c33a 08c28e4e15f3de3b024524894d9235dfcdb48c19 CI 1631477922 -0300 commit: file2 -08c28e4e15f3de3b024524894d9235dfcdb48c19 2515eabac6791725f4a3326676a1491f09664afc CI 1631477922 -0300 commit: file4 diff --git a/test/integration/tags3/expected/repo/.git_keep/logs/refs/heads/test b/test/integration/tags3/expected/repo/.git_keep/logs/refs/heads/test deleted file mode 100644 index 6c2eada73..000000000 --- a/test/integration/tags3/expected/repo/.git_keep/logs/refs/heads/test +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 88d7a40883abd57297127b3777a2a7ec3696c33a CI 1631477929 -0300 branch: Created from 88d7a40883abd57297127b3777a2a7ec3696c33a diff --git a/test/integration/tags3/expected/repo/.git_keep/objects/08/c28e4e15f3de3b024524894d9235dfcdb48c19 b/test/integration/tags3/expected/repo/.git_keep/objects/08/c28e4e15f3de3b024524894d9235dfcdb48c19 deleted file mode 100644 index 76468e806..000000000 Binary files a/test/integration/tags3/expected/repo/.git_keep/objects/08/c28e4e15f3de3b024524894d9235dfcdb48c19 and /dev/null differ diff --git a/test/integration/tags3/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/tags3/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/tags3/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/tags3/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/tags3/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67..000000000 Binary files a/test/integration/tags3/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 and /dev/null differ diff --git a/test/integration/tags3/expected/repo/.git_keep/objects/25/15eabac6791725f4a3326676a1491f09664afc b/test/integration/tags3/expected/repo/.git_keep/objects/25/15eabac6791725f4a3326676a1491f09664afc deleted file mode 100644 index 79c619559..000000000 Binary files a/test/integration/tags3/expected/repo/.git_keep/objects/25/15eabac6791725f4a3326676a1491f09664afc and /dev/null differ diff --git a/test/integration/tags3/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/tags3/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d..000000000 Binary files a/test/integration/tags3/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da and /dev/null differ diff --git a/test/integration/tags3/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 b/test/integration/tags3/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 deleted file mode 100644 index 39b5247e9..000000000 Binary files a/test/integration/tags3/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 and /dev/null differ diff --git a/test/integration/tags3/expected/repo/.git_keep/objects/46/b4990797fac897fb135dd639a4cad3b0269f2d b/test/integration/tags3/expected/repo/.git_keep/objects/46/b4990797fac897fb135dd639a4cad3b0269f2d deleted file mode 100644 index f51f91225..000000000 Binary files a/test/integration/tags3/expected/repo/.git_keep/objects/46/b4990797fac897fb135dd639a4cad3b0269f2d and /dev/null differ diff --git a/test/integration/tags3/expected/repo/.git_keep/objects/88/d7a40883abd57297127b3777a2a7ec3696c33a b/test/integration/tags3/expected/repo/.git_keep/objects/88/d7a40883abd57297127b3777a2a7ec3696c33a deleted file mode 100644 index c4f33543e..000000000 Binary files a/test/integration/tags3/expected/repo/.git_keep/objects/88/d7a40883abd57297127b3777a2a7ec3696c33a and /dev/null differ diff --git a/test/integration/tags3/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/tags3/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06d..000000000 Binary files a/test/integration/tags3/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c and /dev/null differ diff --git a/test/integration/tags3/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/tags3/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/tags3/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/tags3/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/tags3/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/tags3/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/tags3/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/tags3/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/tags3/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/tags3/expected/repo/.git_keep/refs/heads/master b/test/integration/tags3/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 0bcc4f3ee..000000000 --- a/test/integration/tags3/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -2515eabac6791725f4a3326676a1491f09664afc diff --git a/test/integration/tags3/expected/repo/.git_keep/refs/heads/test b/test/integration/tags3/expected/repo/.git_keep/refs/heads/test deleted file mode 100644 index 6be0d41dc..000000000 --- a/test/integration/tags3/expected/repo/.git_keep/refs/heads/test +++ /dev/null @@ -1 +0,0 @@ -88d7a40883abd57297127b3777a2a7ec3696c33a diff --git a/test/integration/tags3/expected/repo/.git_keep/refs/tags/one b/test/integration/tags3/expected/repo/.git_keep/refs/tags/one deleted file mode 100644 index d62cf9b9d..000000000 --- a/test/integration/tags3/expected/repo/.git_keep/refs/tags/one +++ /dev/null @@ -1 +0,0 @@ -08c28e4e15f3de3b024524894d9235dfcdb48c19 diff --git a/test/integration/tags3/expected/repo/file0 b/test/integration/tags3/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/tags3/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/tags3/expected/repo/file1 b/test/integration/tags3/expected/repo/file1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/tags3/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/tags3/recording.json b/test/integration/tags3/recording.json deleted file mode 100644 index 483f51ab7..000000000 --- a/test/integration/tags3/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":549,"Mod":0,"Key":256,"Ch":52},{"Timestamp":1242,"Mod":0,"Key":256,"Ch":106},{"Timestamp":1503,"Mod":0,"Key":256,"Ch":84},{"Timestamp":1820,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2800,"Mod":0,"Key":256,"Ch":111},{"Timestamp":2874,"Mod":0,"Key":256,"Ch":110},{"Timestamp":2957,"Mod":0,"Key":256,"Ch":101},{"Timestamp":3448,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3962,"Mod":0,"Key":256,"Ch":51},{"Timestamp":4279,"Mod":0,"Key":256,"Ch":93},{"Timestamp":4429,"Mod":0,"Key":256,"Ch":93},{"Timestamp":4896,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5541,"Mod":0,"Key":256,"Ch":106},{"Timestamp":6284,"Mod":0,"Key":256,"Ch":110},{"Timestamp":6690,"Mod":0,"Key":256,"Ch":116},{"Timestamp":6755,"Mod":0,"Key":256,"Ch":101},{"Timestamp":6826,"Mod":0,"Key":256,"Ch":115},{"Timestamp":6904,"Mod":0,"Key":256,"Ch":116},{"Timestamp":7213,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8557,"Mod":0,"Key":256,"Ch":106},{"Timestamp":8743,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":211,"Height":42}]} \ No newline at end of file diff --git a/test/integration/tags3/setup.sh b/test/integration/tags3/setup.sh deleted file mode 100644 index 8806332fd..000000000 --- a/test/integration/tags3/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 test3 > file4 -git add . -git commit -am file4 diff --git a/test/integration/tags3/test.json b/test/integration/tags3/test.json deleted file mode 100644 index e376ed544..000000000 --- a/test/integration/tags3/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "viewing commits of tags", "speed": 10 } diff --git a/test/integration/tags4/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/tags4/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index e2129701f..000000000 --- a/test/integration/tags4/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -file1 diff --git a/test/integration/tags4/expected/repo/.git_keep/FETCH_HEAD b/test/integration/tags4/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/tags4/expected/repo/.git_keep/HEAD b/test/integration/tags4/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/tags4/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/tags4/expected/repo/.git_keep/config b/test/integration/tags4/expected/repo/.git_keep/config deleted file mode 100644 index 596ebaeb3..000000000 --- a/test/integration/tags4/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/tags4/expected/repo/.git_keep/description b/test/integration/tags4/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/tags4/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/tags4/expected/repo/.git_keep/index b/test/integration/tags4/expected/repo/.git_keep/index deleted file mode 100644 index 48e219dd6..000000000 Binary files a/test/integration/tags4/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/tags4/expected/repo/.git_keep/info/exclude b/test/integration/tags4/expected/repo/.git_keep/info/exclude deleted file mode 100644 index a5196d1be..000000000 --- a/test/integration/tags4/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/tags4/expected/repo/.git_keep/logs/HEAD b/test/integration/tags4/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 7544ecd9d..000000000 --- a/test/integration/tags4/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 f04e94a59e6159acf554fc1268742df10fe6b0d3 CI 1631476697 -0300 commit (initial): file0 -f04e94a59e6159acf554fc1268742df10fe6b0d3 3a64c1649510c0dcaca3815291e3d43980f1bb99 CI 1631476697 -0300 commit: file1 diff --git a/test/integration/tags4/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/tags4/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 7544ecd9d..000000000 --- a/test/integration/tags4/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 f04e94a59e6159acf554fc1268742df10fe6b0d3 CI 1631476697 -0300 commit (initial): file0 -f04e94a59e6159acf554fc1268742df10fe6b0d3 3a64c1649510c0dcaca3815291e3d43980f1bb99 CI 1631476697 -0300 commit: file1 diff --git a/test/integration/tags4/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/tags4/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67..000000000 Binary files a/test/integration/tags4/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 and /dev/null differ diff --git a/test/integration/tags4/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/tags4/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d..000000000 Binary files a/test/integration/tags4/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da and /dev/null differ diff --git a/test/integration/tags4/expected/repo/.git_keep/objects/3a/64c1649510c0dcaca3815291e3d43980f1bb99 b/test/integration/tags4/expected/repo/.git_keep/objects/3a/64c1649510c0dcaca3815291e3d43980f1bb99 deleted file mode 100644 index 25a275337..000000000 Binary files a/test/integration/tags4/expected/repo/.git_keep/objects/3a/64c1649510c0dcaca3815291e3d43980f1bb99 and /dev/null differ diff --git a/test/integration/tags4/expected/repo/.git_keep/objects/56/18f31c7550111a878fb63f6079e8462ae94c42 b/test/integration/tags4/expected/repo/.git_keep/objects/56/18f31c7550111a878fb63f6079e8462ae94c42 deleted file mode 100644 index ffbba8d79..000000000 --- a/test/integration/tags4/expected/repo/.git_keep/objects/56/18f31c7550111a878fb63f6079e8462ae94c42 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0E]&M1&1(6 -3P7T`;!bO(8 ہ.8RϪ K)jj6\o.KMyK.Nh?+h'i \ No newline at end of file diff --git a/test/integration/tags4/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/tags4/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/tags4/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/tags4/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/tags4/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/tags4/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/tags4/expected/repo/.git_keep/objects/db/03048dbacea165536b49c030c9aaca108cc571 b/test/integration/tags4/expected/repo/.git_keep/objects/db/03048dbacea165536b49c030c9aaca108cc571 deleted file mode 100644 index 59aa04b0e..000000000 Binary files a/test/integration/tags4/expected/repo/.git_keep/objects/db/03048dbacea165536b49c030c9aaca108cc571 and /dev/null differ diff --git a/test/integration/tags4/expected/repo/.git_keep/objects/f0/4e94a59e6159acf554fc1268742df10fe6b0d3 b/test/integration/tags4/expected/repo/.git_keep/objects/f0/4e94a59e6159acf554fc1268742df10fe6b0d3 deleted file mode 100644 index e15c21c24..000000000 Binary files a/test/integration/tags4/expected/repo/.git_keep/objects/f0/4e94a59e6159acf554fc1268742df10fe6b0d3 and /dev/null differ diff --git a/test/integration/tags4/expected/repo/.git_keep/packed-refs b/test/integration/tags4/expected/repo/.git_keep/packed-refs deleted file mode 100644 index 250f18738..000000000 --- a/test/integration/tags4/expected/repo/.git_keep/packed-refs +++ /dev/null @@ -1 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted diff --git a/test/integration/tags4/expected/repo/.git_keep/refs/heads/master b/test/integration/tags4/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 2a642862a..000000000 --- a/test/integration/tags4/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -3a64c1649510c0dcaca3815291e3d43980f1bb99 diff --git a/test/integration/tags4/expected/repo/.git_keep/refs/tags/atag2 b/test/integration/tags4/expected/repo/.git_keep/refs/tags/atag2 deleted file mode 100644 index 131e3c98f..000000000 --- a/test/integration/tags4/expected/repo/.git_keep/refs/tags/atag2 +++ /dev/null @@ -1 +0,0 @@ -db03048dbacea165536b49c030c9aaca108cc571 diff --git a/test/integration/tags4/expected/repo/file0 b/test/integration/tags4/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/tags4/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/tags4/expected/repo/file1 b/test/integration/tags4/expected/repo/file1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/tags4/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/tags4/recording.json b/test/integration/tags4/recording.json deleted file mode 100644 index 4c7e689c5..000000000 --- a/test/integration/tags4/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":928,"Mod":0,"Key":256,"Ch":52},{"Timestamp":1864,"Mod":0,"Key":256,"Ch":84},{"Timestamp":2752,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2936,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5085,"Mod":0,"Key":256,"Ch":97},{"Timestamp":5306,"Mod":0,"Key":256,"Ch":116},{"Timestamp":5392,"Mod":0,"Key":256,"Ch":97},{"Timestamp":5526,"Mod":0,"Key":256,"Ch":103},{"Timestamp":5754,"Mod":0,"Key":256,"Ch":49},{"Timestamp":5983,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7385,"Mod":0,"Key":256,"Ch":116},{"Timestamp":7489,"Mod":0,"Key":256,"Ch":97},{"Timestamp":7808,"Mod":0,"Key":256,"Ch":103},{"Timestamp":7911,"Mod":0,"Key":256,"Ch":32},{"Timestamp":8171,"Mod":0,"Key":256,"Ch":109},{"Timestamp":8240,"Mod":0,"Key":256,"Ch":101},{"Timestamp":8404,"Mod":0,"Key":256,"Ch":115},{"Timestamp":8572,"Mod":0,"Key":256,"Ch":115},{"Timestamp":8656,"Mod":0,"Key":256,"Ch":97},{"Timestamp":8749,"Mod":0,"Key":256,"Ch":103},{"Timestamp":8832,"Mod":0,"Key":256,"Ch":101},{"Timestamp":10162,"Mod":0,"Key":256,"Ch":33},{"Timestamp":10432,"Mod":0,"Key":13,"Ch":13},{"Timestamp":11766,"Mod":0,"Key":256,"Ch":106},{"Timestamp":13092,"Mod":0,"Key":256,"Ch":84},{"Timestamp":14177,"Mod":0,"Key":258,"Ch":0},{"Timestamp":14482,"Mod":0,"Key":13,"Ch":13},{"Timestamp":15660,"Mod":0,"Key":256,"Ch":97},{"Timestamp":15783,"Mod":0,"Key":256,"Ch":116},{"Timestamp":15857,"Mod":0,"Key":256,"Ch":97},{"Timestamp":15991,"Mod":0,"Key":256,"Ch":103},{"Timestamp":17243,"Mod":0,"Key":256,"Ch":50},{"Timestamp":17536,"Mod":0,"Key":13,"Ch":13},{"Timestamp":19574,"Mod":0,"Key":256,"Ch":115},{"Timestamp":19641,"Mod":0,"Key":256,"Ch":101},{"Timestamp":19834,"Mod":0,"Key":256,"Ch":99},{"Timestamp":19863,"Mod":0,"Key":256,"Ch":111},{"Timestamp":19958,"Mod":0,"Key":256,"Ch":110},{"Timestamp":20013,"Mod":0,"Key":256,"Ch":100},{"Timestamp":20092,"Mod":0,"Key":256,"Ch":32},{"Timestamp":20181,"Mod":0,"Key":256,"Ch":109},{"Timestamp":20265,"Mod":0,"Key":256,"Ch":101},{"Timestamp":20436,"Mod":0,"Key":256,"Ch":115},{"Timestamp":20590,"Mod":0,"Key":256,"Ch":115},{"Timestamp":20675,"Mod":0,"Key":256,"Ch":97},{"Timestamp":20706,"Mod":0,"Key":256,"Ch":103},{"Timestamp":20805,"Mod":0,"Key":256,"Ch":101},{"Timestamp":21237,"Mod":0,"Key":13,"Ch":13},{"Timestamp":22701,"Mod":0,"Key":256,"Ch":51},{"Timestamp":23066,"Mod":0,"Key":256,"Ch":93},{"Timestamp":23235,"Mod":0,"Key":256,"Ch":93},{"Timestamp":24842,"Mod":0,"Key":256,"Ch":106},{"Timestamp":25574,"Mod":0,"Key":256,"Ch":100},{"Timestamp":26166,"Mod":0,"Key":13,"Ch":13},{"Timestamp":27722,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":211,"Height":42}]} \ No newline at end of file diff --git a/test/integration/tags4/setup.sh b/test/integration/tags4/setup.sh deleted file mode 100644 index e878a9ed5..000000000 --- a/test/integration/tags4/setup.sh +++ /dev/null @@ -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 test0 > file0 -git add . -git commit -am file0 - -echo test1 > file1 -git add . -git commit -am file1 diff --git a/test/integration/tags4/test.json b/test/integration/tags4/test.json deleted file mode 100644 index 26a2080c6..000000000 --- a/test/integration/tags4/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "annotated tag CRUD", "speed": 5 } diff --git a/test/integration/undo2/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/undo2/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 6c493ff74..000000000 --- a/test/integration/undo2/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -file2 diff --git a/test/integration/undo2/expected/repo/.git_keep/FETCH_HEAD b/test/integration/undo2/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/undo2/expected/repo/.git_keep/HEAD b/test/integration/undo2/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/undo2/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/undo2/expected/repo/.git_keep/ORIG_HEAD b/test/integration/undo2/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 064ef4565..000000000 --- a/test/integration/undo2/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -481ce2cf9d037b83acb1d452973695764bf7b95e diff --git a/test/integration/undo2/expected/repo/.git_keep/config b/test/integration/undo2/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/undo2/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/undo2/expected/repo/.git_keep/description b/test/integration/undo2/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/undo2/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/undo2/expected/repo/.git_keep/index b/test/integration/undo2/expected/repo/.git_keep/index deleted file mode 100644 index 0385f0c7e..000000000 Binary files a/test/integration/undo2/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/undo2/expected/repo/.git_keep/info/exclude b/test/integration/undo2/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/undo2/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/undo2/expected/repo/.git_keep/logs/HEAD b/test/integration/undo2/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index dfd7e1862..000000000 --- a/test/integration/undo2/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,28 +0,0 @@ -0000000000000000000000000000000000000000 8d31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 CI 1617683460 +1000 commit (initial): file0 -8d31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 0e2680a41392859e5159716b50525850017c6a59 CI 1617683460 +1000 commit: file1 -0e2680a41392859e5159716b50525850017c6a59 bce6c0c795a3d37c0a2c382a6d9c146b1889f86c CI 1617683460 +1000 commit: file2 -bce6c0c795a3d37c0a2c382a6d9c146b1889f86c a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683460 +1000 commit: file4 -a3bf51bf610771f997de1d3f313ab7c43e20bef5 a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683460 +1000 checkout: moving from master to branch2 -a3bf51bf610771f997de1d3f313ab7c43e20bef5 481ce2cf9d037b83acb1d452973695764bf7b95e CI 1617683460 +1000 commit: file4 -481ce2cf9d037b83acb1d452973695764bf7b95e e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683460 +1000 commit: file4 -e51d8e24ead991fdd7fd9b9d90924c2e24576981 df1876c035ade1ba199afadd399a6d4273190cd8 CI 1617683460 +1000 commit: file2 -df1876c035ade1ba199afadd399a6d4273190cd8 a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683461 +1000 checkout: moving from branch2 to master -a3bf51bf610771f997de1d3f313ab7c43e20bef5 bce6c0c795a3d37c0a2c382a6d9c146b1889f86c CI 1617683462 +1000 rebase -i (start): checkout bce6c0c795a3d37c0a2c382a6d9c146b1889f86c -bce6c0c795a3d37c0a2c382a6d9c146b1889f86c bce6c0c795a3d37c0a2c382a6d9c146b1889f86c CI 1617683462 +1000 rebase -i (finish): returning to refs/heads/master -bce6c0c795a3d37c0a2c382a6d9c146b1889f86c 0e2680a41392859e5159716b50525850017c6a59 CI 1617683463 +1000 rebase -i (start): checkout 0e2680a41392859e5159716b50525850017c6a59 -0e2680a41392859e5159716b50525850017c6a59 0e2680a41392859e5159716b50525850017c6a59 CI 1617683463 +1000 rebase -i (finish): returning to refs/heads/master -0e2680a41392859e5159716b50525850017c6a59 df1876c035ade1ba199afadd399a6d4273190cd8 CI 1617683464 +1000 checkout: moving from master to branch2 -df1876c035ade1ba199afadd399a6d4273190cd8 e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683465 +1000 rebase -i (start): checkout e51d8e24ead991fdd7fd9b9d90924c2e24576981 -e51d8e24ead991fdd7fd9b9d90924c2e24576981 e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683465 +1000 rebase -i (finish): returning to refs/heads/branch2 -e51d8e24ead991fdd7fd9b9d90924c2e24576981 481ce2cf9d037b83acb1d452973695764bf7b95e CI 1617683466 +1000 rebase -i (start): checkout 481ce2cf9d037b83acb1d452973695764bf7b95e -481ce2cf9d037b83acb1d452973695764bf7b95e 481ce2cf9d037b83acb1d452973695764bf7b95e CI 1617683466 +1000 rebase -i (finish): returning to refs/heads/branch2 -481ce2cf9d037b83acb1d452973695764bf7b95e e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683466 +1000 [lazygit undo]: updating HEAD -e51d8e24ead991fdd7fd9b9d90924c2e24576981 df1876c035ade1ba199afadd399a6d4273190cd8 CI 1617683467 +1000 [lazygit undo]: updating HEAD -df1876c035ade1ba199afadd399a6d4273190cd8 0e2680a41392859e5159716b50525850017c6a59 CI 1617683467 +1000 [lazygit undo] -0e2680a41392859e5159716b50525850017c6a59 bce6c0c795a3d37c0a2c382a6d9c146b1889f86c CI 1617683468 +1000 [lazygit undo]: updating HEAD -bce6c0c795a3d37c0a2c382a6d9c146b1889f86c a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683468 +1000 [lazygit undo]: updating HEAD -a3bf51bf610771f997de1d3f313ab7c43e20bef5 df1876c035ade1ba199afadd399a6d4273190cd8 CI 1617683469 +1000 [lazygit undo] -df1876c035ade1ba199afadd399a6d4273190cd8 e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683470 +1000 [lazygit undo]: updating HEAD -e51d8e24ead991fdd7fd9b9d90924c2e24576981 481ce2cf9d037b83acb1d452973695764bf7b95e CI 1617683470 +1000 [lazygit undo]: updating HEAD -481ce2cf9d037b83acb1d452973695764bf7b95e a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683471 +1000 [lazygit undo]: updating HEAD -a3bf51bf610771f997de1d3f313ab7c43e20bef5 a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683471 +1000 [lazygit undo] diff --git a/test/integration/undo2/expected/repo/.git_keep/logs/refs/heads/branch2 b/test/integration/undo2/expected/repo/.git_keep/logs/refs/heads/branch2 deleted file mode 100644 index 692281b19..000000000 --- a/test/integration/undo2/expected/repo/.git_keep/logs/refs/heads/branch2 +++ /dev/null @@ -1,11 +0,0 @@ -0000000000000000000000000000000000000000 a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683460 +1000 branch: Created from HEAD -a3bf51bf610771f997de1d3f313ab7c43e20bef5 481ce2cf9d037b83acb1d452973695764bf7b95e CI 1617683460 +1000 commit: file4 -481ce2cf9d037b83acb1d452973695764bf7b95e e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683460 +1000 commit: file4 -e51d8e24ead991fdd7fd9b9d90924c2e24576981 df1876c035ade1ba199afadd399a6d4273190cd8 CI 1617683460 +1000 commit: file2 -df1876c035ade1ba199afadd399a6d4273190cd8 e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683465 +1000 rebase -i (finish): refs/heads/branch2 onto e51d8e24ead991fdd7fd9b9d90924c2e24576981 -e51d8e24ead991fdd7fd9b9d90924c2e24576981 481ce2cf9d037b83acb1d452973695764bf7b95e CI 1617683466 +1000 rebase -i (finish): refs/heads/branch2 onto 481ce2cf9d037b83acb1d452973695764bf7b95e -481ce2cf9d037b83acb1d452973695764bf7b95e e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683466 +1000 [lazygit undo]: updating HEAD -e51d8e24ead991fdd7fd9b9d90924c2e24576981 df1876c035ade1ba199afadd399a6d4273190cd8 CI 1617683467 +1000 [lazygit undo]: updating HEAD -df1876c035ade1ba199afadd399a6d4273190cd8 e51d8e24ead991fdd7fd9b9d90924c2e24576981 CI 1617683470 +1000 [lazygit undo]: updating HEAD -e51d8e24ead991fdd7fd9b9d90924c2e24576981 481ce2cf9d037b83acb1d452973695764bf7b95e CI 1617683470 +1000 [lazygit undo]: updating HEAD -481ce2cf9d037b83acb1d452973695764bf7b95e a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683471 +1000 [lazygit undo]: updating HEAD diff --git a/test/integration/undo2/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/undo2/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 805835942..000000000 --- a/test/integration/undo2/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,8 +0,0 @@ -0000000000000000000000000000000000000000 8d31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 CI 1617683460 +1000 commit (initial): file0 -8d31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 0e2680a41392859e5159716b50525850017c6a59 CI 1617683460 +1000 commit: file1 -0e2680a41392859e5159716b50525850017c6a59 bce6c0c795a3d37c0a2c382a6d9c146b1889f86c CI 1617683460 +1000 commit: file2 -bce6c0c795a3d37c0a2c382a6d9c146b1889f86c a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683460 +1000 commit: file4 -a3bf51bf610771f997de1d3f313ab7c43e20bef5 bce6c0c795a3d37c0a2c382a6d9c146b1889f86c CI 1617683462 +1000 rebase -i (finish): refs/heads/master onto bce6c0c795a3d37c0a2c382a6d9c146b1889f86c -bce6c0c795a3d37c0a2c382a6d9c146b1889f86c 0e2680a41392859e5159716b50525850017c6a59 CI 1617683463 +1000 rebase -i (finish): refs/heads/master onto 0e2680a41392859e5159716b50525850017c6a59 -0e2680a41392859e5159716b50525850017c6a59 bce6c0c795a3d37c0a2c382a6d9c146b1889f86c CI 1617683468 +1000 [lazygit undo]: updating HEAD -bce6c0c795a3d37c0a2c382a6d9c146b1889f86c a3bf51bf610771f997de1d3f313ab7c43e20bef5 CI 1617683468 +1000 [lazygit undo]: updating HEAD diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 b/test/integration/undo2/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 deleted file mode 100644 index 38acaeff2..000000000 Binary files a/test/integration/undo2/expected/repo/.git_keep/objects/0c/2aa38e0600e0d2df09c2f84664d8a14f899879 and /dev/null differ diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/0e/2680a41392859e5159716b50525850017c6a59 b/test/integration/undo2/expected/repo/.git_keep/objects/0e/2680a41392859e5159716b50525850017c6a59 deleted file mode 100644 index dab8fd41a..000000000 --- a/test/integration/undo2/expected/repo/.git_keep/objects/0e/2680a41392859e5159716b50525850017c6a59 +++ /dev/null @@ -1,2 +0,0 @@ -x; -0 @; EGBCeH\#ty Ou.P(,̮zj$.U(wzdѓ88&!$𧿶Sd[ egnڼ(9 \ No newline at end of file diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/undo2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/undo2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/undo2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67..000000000 Binary files a/test/integration/undo2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 and /dev/null differ diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 b/test/integration/undo2/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 deleted file mode 100644 index d4270c258..000000000 Binary files a/test/integration/undo2/expected/repo/.git_keep/objects/2d/00bd505971a8bc7318d98e003aee708a367c85 and /dev/null differ diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/undo2/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d..000000000 Binary files a/test/integration/undo2/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da and /dev/null differ diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a b/test/integration/undo2/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a deleted file mode 100644 index 65140e8b7..000000000 Binary files a/test/integration/undo2/expected/repo/.git_keep/objects/3b/aaa732b89ed46a1af1b24d0d4e3b8c7375684a and /dev/null differ diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b b/test/integration/undo2/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b deleted file mode 100644 index e0473aaf4..000000000 Binary files a/test/integration/undo2/expected/repo/.git_keep/objects/3d/b2086f780b1cf632eec29111ef395913a8ab2b and /dev/null differ diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/48/1ce2cf9d037b83acb1d452973695764bf7b95e b/test/integration/undo2/expected/repo/.git_keep/objects/48/1ce2cf9d037b83acb1d452973695764bf7b95e deleted file mode 100644 index a4ba62ac1..000000000 --- a/test/integration/undo2/expected/repo/.git_keep/objects/48/1ce2cf9d037b83acb1d452973695764bf7b95e +++ /dev/null @@ -1,2 +0,0 @@ -xA - @Ѯ=BqIBV9ƨ# & =~sn?o-U; r x@Y4 Dr[T#B$q`_aާ_iň'7uY՛n: \ No newline at end of file diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 b/test/integration/undo2/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 deleted file mode 100644 index ed5045497..000000000 Binary files a/test/integration/undo2/expected/repo/.git_keep/objects/59/a0ec98e1847ca72dc35b7ab8b84f527b6af280 and /dev/null differ diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/8d/31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 b/test/integration/undo2/expected/repo/.git_keep/objects/8d/31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 deleted file mode 100644 index e5028f911..000000000 Binary files a/test/integration/undo2/expected/repo/.git_keep/objects/8d/31a10ce1a1a1606ab02e8a2a59a6c56808f7c5 and /dev/null differ diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 b/test/integration/undo2/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 deleted file mode 100644 index 2920ab335..000000000 Binary files a/test/integration/undo2/expected/repo/.git_keep/objects/8e/4cb0cd56d785ba4442a5b20e7ae5de5ae33723 and /dev/null differ diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/undo2/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06d..000000000 Binary files a/test/integration/undo2/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c and /dev/null differ diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/a3/bf51bf610771f997de1d3f313ab7c43e20bef5 b/test/integration/undo2/expected/repo/.git_keep/objects/a3/bf51bf610771f997de1d3f313ab7c43e20bef5 deleted file mode 100644 index 751b9844f..000000000 Binary files a/test/integration/undo2/expected/repo/.git_keep/objects/a3/bf51bf610771f997de1d3f313ab7c43e20bef5 and /dev/null differ diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/undo2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/undo2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/bc/e6c0c795a3d37c0a2c382a6d9c146b1889f86c b/test/integration/undo2/expected/repo/.git_keep/objects/bc/e6c0c795a3d37c0a2c382a6d9c146b1889f86c deleted file mode 100644 index bc5e863f8..000000000 Binary files a/test/integration/undo2/expected/repo/.git_keep/objects/bc/e6c0c795a3d37c0a2c382a6d9c146b1889f86c and /dev/null differ diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/undo2/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/undo2/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/undo2/expected/repo/.git_keep/objects/df/1876c035ade1ba199afadd399a6d4273190cd8 b/test/integration/undo2/expected/repo/.git_keep/objects/df/1876c035ade1ba199afadd399a6d4273190cd8 deleted file mode 100644 index 53e3c7aaa..000000000 Binary files a/test/integration/undo2/expected/repo/.git_keep/objects/df/1876c035ade1ba199afadd399a6d4273190cd8 and /dev/null differ diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/e5/1d8e24ead991fdd7fd9b9d90924c2e24576981 b/test/integration/undo2/expected/repo/.git_keep/objects/e5/1d8e24ead991fdd7fd9b9d90924c2e24576981 deleted file mode 100644 index d784921aa..000000000 Binary files a/test/integration/undo2/expected/repo/.git_keep/objects/e5/1d8e24ead991fdd7fd9b9d90924c2e24576981 and /dev/null differ diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 b/test/integration/undo2/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 deleted file mode 100644 index 01ce23cee..000000000 Binary files a/test/integration/undo2/expected/repo/.git_keep/objects/e5/c5c5583f49a34e86ce622b59363df99e09d4c6 and /dev/null differ diff --git a/test/integration/undo2/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a b/test/integration/undo2/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a deleted file mode 100644 index 08edf28f3..000000000 Binary files a/test/integration/undo2/expected/repo/.git_keep/objects/e7/76522ac28860d2eba6fe98fa4fad67e798419a and /dev/null differ diff --git a/test/integration/undo2/expected/repo/.git_keep/refs/heads/branch2 b/test/integration/undo2/expected/repo/.git_keep/refs/heads/branch2 deleted file mode 100644 index fe4f6f367..000000000 --- a/test/integration/undo2/expected/repo/.git_keep/refs/heads/branch2 +++ /dev/null @@ -1 +0,0 @@ -a3bf51bf610771f997de1d3f313ab7c43e20bef5 diff --git a/test/integration/undo2/expected/repo/.git_keep/refs/heads/master b/test/integration/undo2/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index fe4f6f367..000000000 --- a/test/integration/undo2/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -a3bf51bf610771f997de1d3f313ab7c43e20bef5 diff --git a/test/integration/undo2/expected/repo/file0 b/test/integration/undo2/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/undo2/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/undo2/expected/repo/file1 b/test/integration/undo2/expected/repo/file1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/undo2/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/undo2/expected/repo/file2 b/test/integration/undo2/expected/repo/file2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/undo2/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/undo2/expected/repo/file4 b/test/integration/undo2/expected/repo/file4 deleted file mode 100644 index 2d00bd505..000000000 --- a/test/integration/undo2/expected/repo/file4 +++ /dev/null @@ -1 +0,0 @@ -line one diff --git a/test/integration/undo2/recording.json b/test/integration/undo2/recording.json deleted file mode 100644 index c9398dfa5..000000000 --- a/test/integration/undo2/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":647,"Mod":0,"Key":259,"Ch":0},{"Timestamp":917,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1245,"Mod":0,"Key":256,"Ch":32},{"Timestamp":1646,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1957,"Mod":0,"Key":256,"Ch":100},{"Timestamp":2205,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2533,"Mod":0,"Key":256,"Ch":100},{"Timestamp":2765,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3141,"Mod":0,"Key":260,"Ch":0},{"Timestamp":3397,"Mod":0,"Key":257,"Ch":0},{"Timestamp":3637,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3933,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4780,"Mod":0,"Key":259,"Ch":0},{"Timestamp":5205,"Mod":0,"Key":256,"Ch":100},{"Timestamp":5405,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5685,"Mod":0,"Key":256,"Ch":100},{"Timestamp":5877,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6277,"Mod":0,"Key":256,"Ch":122},{"Timestamp":6725,"Mod":0,"Key":256,"Ch":122},{"Timestamp":7317,"Mod":0,"Key":256,"Ch":122},{"Timestamp":7845,"Mod":0,"Key":256,"Ch":122},{"Timestamp":8372,"Mod":0,"Key":256,"Ch":122},{"Timestamp":8885,"Mod":0,"Key":256,"Ch":122},{"Timestamp":9469,"Mod":0,"Key":256,"Ch":122},{"Timestamp":10069,"Mod":0,"Key":256,"Ch":122},{"Timestamp":10645,"Mod":0,"Key":256,"Ch":122},{"Timestamp":11189,"Mod":0,"Key":256,"Ch":122},{"Timestamp":12077,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/undo2/setup.sh b/test/integration/undo2/setup.sh deleted file mode 100644 index 4cd444a1f..000000000 --- a/test/integration/undo2/setup.sh +++ /dev/null @@ -1,40 +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 "line one" > file4 -git add . -git commit -am file4 - -git checkout -b branch2 - -echo "line two" >> file4 -git add . -git commit -am file4 - -echo "line three" >> file4 -git add . -git commit -am file4 - -echo "line two" >> file2 -git add . -git commit -am file2 diff --git a/test/integration/undo2/test.json b/test/integration/undo2/test.json deleted file mode 100644 index 1080ff7ec..000000000 --- a/test/integration/undo2/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "undoing changes in both commits and branches. Skipped because it's failing on CI for some reason", "speed": 10, "skip":true}