diff --git a/pkg/commands/git_commands/rebase.go b/pkg/commands/git_commands/rebase.go index 50ab4de7a..cff9b961a 100644 --- a/pkg/commands/git_commands/rebase.go +++ b/pkg/commands/git_commands/rebase.go @@ -95,17 +95,15 @@ func (self *RebaseCommands) GenericAmend(commits []*models.Commit, index int, f } func (self *RebaseCommands) MoveCommitDown(commits []*models.Commit, index int) error { - // we must ensure that we have at least two commits after the selected one - if len(commits) <= index+2 { - // assuming they aren't picking the bottom commit - return errors.New(self.Tr.NoRoom) - } - - orderedCommits := append(commits[0:index], commits[index+1], commits[index]) + // not appending to original slice so that we don't mutate it + orderedCommits := append([]*models.Commit{}, commits[0:index]...) + orderedCommits = append(orderedCommits, commits[index+1], commits[index]) todoLines := self.BuildTodoLinesSingleAction(orderedCommits, "pick") - return self.PrepareInteractiveRebaseCommand(commits[index+2].Sha, todoLines, true).Run() + baseShaOrRoot := getBaseShaOrRoot(commits, index+2) + + return self.PrepareInteractiveRebaseCommand(baseShaOrRoot, todoLines, true).Run() } func (self *RebaseCommands) InteractiveRebase(commits []*models.Commit, index int, action string) error { @@ -189,12 +187,9 @@ func (self *RebaseCommands) BuildSingleActionTodo(commits []*models.Commit, acti } }) - baseSha := "--root" - if baseIndex < len(commits) { - baseSha = commits[baseIndex].Sha - } + baseShaOrRoot := getBaseShaOrRoot(commits, baseIndex) - return todoLines, baseSha, nil + return todoLines, baseShaOrRoot, nil } // AmendTo amends the given commit with whatever files are staged @@ -418,3 +413,17 @@ func (self *TodoLine) ToString() string { return self.Action + " " + self.Commit.Sha + " " + self.Commit.Name + "\n" } } + +// we can't start an interactive rebase from the first commit without passing the +// '--root' arg +func getBaseShaOrRoot(commits []*models.Commit, index int) string { + // We assume that the commits slice contains the initial commit of the repo. + // Technically this assumption could prove false, but it's unlikely you'll + // be starting a rebase from 300 commits ago (which is the original commit limit + // at time of writing) + if index < len(commits) { + return commits[index].Sha + } else { + return "--root" + } +} diff --git a/pkg/gui/controllers/local_commits_controller.go b/pkg/gui/controllers/local_commits_controller.go index 6465dd292..01a531bc9 100644 --- a/pkg/gui/controllers/local_commits_controller.go +++ b/pkg/gui/controllers/local_commits_controller.go @@ -358,6 +358,12 @@ func (self *LocalCommitsController) handleMidRebaseCommand(action string, commit func (self *LocalCommitsController) moveDown(commit *models.Commit) error { index := self.context().GetSelectedLineIdx() commits := self.model.Commits + + // can't move past the initial commit + if index >= len(commits)-1 { + return nil + } + if commit.Status == "rebasing" { if commits[index+1].Status != "rebasing" { return nil diff --git a/pkg/integration/tests/interactive_rebase/move.go b/pkg/integration/tests/interactive_rebase/move.go new file mode 100644 index 000000000..e7679a793 --- /dev/null +++ b/pkg/integration/tests/interactive_rebase/move.go @@ -0,0 +1,84 @@ +package interactive_rebase + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var Move = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Directly move a commit all the way down and all the way back up", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateNCommits(4) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Lines( + Contains("commit 04").IsSelected(), + Contains("commit 03"), + Contains("commit 02"), + Contains("commit 01"), + ). + Press(keys.Commits.MoveDownCommit). + Lines( + Contains("commit 03"), + Contains("commit 04").IsSelected(), + Contains("commit 02"), + Contains("commit 01"), + ). + Press(keys.Commits.MoveDownCommit). + Lines( + Contains("commit 03"), + Contains("commit 02"), + Contains("commit 04").IsSelected(), + Contains("commit 01"), + ). + Press(keys.Commits.MoveDownCommit). + Lines( + Contains("commit 03"), + Contains("commit 02"), + Contains("commit 01"), + Contains("commit 04").IsSelected(), + ). + // assert nothing happens upon trying to move beyond the last commit + Press(keys.Commits.MoveDownCommit). + Lines( + Contains("commit 03"), + Contains("commit 02"), + Contains("commit 01"), + Contains("commit 04").IsSelected(), + ). + Press(keys.Commits.MoveUpCommit). + Lines( + Contains("commit 03"), + Contains("commit 02"), + Contains("commit 04").IsSelected(), + Contains("commit 01"), + ). + Press(keys.Commits.MoveUpCommit). + Lines( + Contains("commit 03"), + Contains("commit 04").IsSelected(), + Contains("commit 02"), + Contains("commit 01"), + ). + Press(keys.Commits.MoveUpCommit). + Lines( + Contains("commit 04").IsSelected(), + Contains("commit 03"), + Contains("commit 02"), + Contains("commit 01"), + ). + // assert nothing happens upon trying to move beyond the first commit + Press(keys.Commits.MoveUpCommit). + Lines( + Contains("commit 04").IsSelected(), + Contains("commit 03"), + Contains("commit 02"), + Contains("commit 01"), + ) + }, +}) diff --git a/pkg/integration/tests/interactive_rebase/move_in_rebase.go b/pkg/integration/tests/interactive_rebase/move_in_rebase.go new file mode 100644 index 000000000..daeedbf87 --- /dev/null +++ b/pkg/integration/tests/interactive_rebase/move_in_rebase.go @@ -0,0 +1,96 @@ +package interactive_rebase + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var MoveInRebase = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Via a single interactive rebase move a commit all the way up then back down then slightly back up again and apply the change", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateNCommits(4) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Lines( + Contains("commit 04").IsSelected(), + Contains("commit 03"), + Contains("commit 02"), + Contains("commit 01"), + ). + NavigateToListItem(Contains("commit 01")). + Press(keys.Universal.Edit). + Lines( + Contains("commit 04"), + Contains("commit 03"), + Contains("commit 02"), + Contains("YOU ARE HERE").Contains("commit 01").IsSelected(), + ). + SelectPreviousItem(). + Press(keys.Commits.MoveUpCommit). + Lines( + Contains("commit 04"), + Contains("commit 02").IsSelected(), + Contains("commit 03"), + Contains("YOU ARE HERE").Contains("commit 01"), + ). + Press(keys.Commits.MoveUpCommit). + Lines( + Contains("commit 02").IsSelected(), + Contains("commit 04"), + Contains("commit 03"), + Contains("YOU ARE HERE").Contains("commit 01"), + ). + Press(keys.Commits.MoveUpCommit). + // assert we can't move past the top + Lines( + Contains("commit 02").IsSelected(), + Contains("commit 04"), + Contains("commit 03"), + Contains("YOU ARE HERE").Contains("commit 01"), + ). + Press(keys.Commits.MoveDownCommit). + Lines( + Contains("commit 04"), + Contains("commit 02").IsSelected(), + Contains("commit 03"), + Contains("YOU ARE HERE").Contains("commit 01"), + ). + Press(keys.Commits.MoveDownCommit). + Lines( + Contains("commit 04"), + Contains("commit 03"), + Contains("commit 02").IsSelected(), + Contains("YOU ARE HERE").Contains("commit 01"), + ). + // assert we can't move past the bottom + Press(keys.Commits.MoveDownCommit). + Lines( + Contains("commit 04"), + Contains("commit 03"), + Contains("commit 02").IsSelected(), + Contains("YOU ARE HERE").Contains("commit 01"), + ). + // move it back up one so that we land in a different order than we started with + Press(keys.Commits.MoveUpCommit). + Lines( + Contains("commit 04"), + Contains("commit 02").IsSelected(), + Contains("commit 03"), + Contains("YOU ARE HERE").Contains("commit 01"), + ). + Tap(func() { + t.Actions().ContinueRebase() + }). + Lines( + Contains("commit 04"), + Contains("commit 02").IsSelected(), + Contains("commit 03"), + DoesNotContain("YOU ARE HERE").Contains("commit 01"), + ) + }, +}) diff --git a/pkg/integration/tests/interactive_rebase/one.go b/pkg/integration/tests/interactive_rebase/one.go deleted file mode 100644 index d6d01239a..000000000 --- a/pkg/integration/tests/interactive_rebase/one.go +++ /dev/null @@ -1,71 +0,0 @@ -package interactive_rebase - -import ( - "github.com/jesseduffield/lazygit/pkg/config" - . "github.com/jesseduffield/lazygit/pkg/integration/components" -) - -var One = NewIntegrationTest(NewIntegrationTestArgs{ - Description: "Begins an interactive rebase, then fixups, drops, and squashes some commits", - ExtraCmdArgs: "", - Skip: false, - SetupConfig: func(config *config.AppConfig) {}, - SetupRepo: func(shell *Shell) { - shell. - CreateNCommits(5) // these will appears at commit 05, 04, 04, down to 01 - }, - Run: func(t *TestDriver, keys config.KeybindingConfig) { - t.Views().Commits(). - Focus(). - Lines( - Contains("commit 05"), - Contains("commit 04"), - Contains("commit 03"), - Contains("commit 02"), - Contains("commit 01"), - ). - NavigateToListItem(Contains("commit 02")). - Press(keys.Universal.Edit). - Lines( - MatchesRegexp("pick.*commit 05"), - MatchesRegexp("pick.*commit 04"), - MatchesRegexp("pick.*commit 03"), - MatchesRegexp("YOU ARE HERE.*commit 02").IsSelected(), - Contains("commit 01"), - ). - SelectPreviousItem(). - Press(keys.Commits.MarkCommitAsFixup). - Lines( - MatchesRegexp("pick.*commit 05"), - MatchesRegexp("pick.*commit 04"), - MatchesRegexp("fixup.*commit 03").IsSelected(), - MatchesRegexp("YOU ARE HERE.*commit 02"), - Contains("commit 01"), - ). - SelectPreviousItem(). - Press(keys.Universal.Remove). - Lines( - MatchesRegexp("pick.*commit 05"), - MatchesRegexp("drop.*commit 04").IsSelected(), - MatchesRegexp("fixup.*commit 03"), - MatchesRegexp("YOU ARE HERE.*commit 02"), - Contains("commit 01"), - ). - SelectPreviousItem(). - Press(keys.Commits.SquashDown). - Lines( - MatchesRegexp("squash.*commit 05").IsSelected(), - MatchesRegexp("drop.*commit 04"), - MatchesRegexp("fixup.*commit 03"), - MatchesRegexp("YOU ARE HERE.*commit 02"), - Contains("commit 01"), - ). - Tap(func() { - t.Actions().ContinueRebase() - }). - Lines( - Contains("commit 02"), - Contains("commit 01"), - ) - }, -}) diff --git a/pkg/integration/tests/interactive_rebase/rebase.go b/pkg/integration/tests/interactive_rebase/rebase.go new file mode 100644 index 000000000..3951d7826 --- /dev/null +++ b/pkg/integration/tests/interactive_rebase/rebase.go @@ -0,0 +1,122 @@ +package interactive_rebase + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var Rebase = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Begins an interactive rebase, then fixups, drops, and squashes some commits", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.EmptyCommit("initial commit") + shell.EmptyCommit("first commit to edit") + shell.EmptyCommit("commit to squash") + shell.EmptyCommit("second commit to edit") + shell.EmptyCommit("commit to drop") + + shell.CreateFileAndAdd("fixup-commit-file", "fixup-commit-file") + shell.Commit("commit to fixup") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Lines( + Contains("commit to fixup"), + Contains("commit to drop"), + Contains("second commit to edit"), + Contains("commit to squash"), + Contains("first commit to edit"), + Contains("initial commit"), + ). + NavigateToListItem(Contains("first commit to edit")). + Press(keys.Universal.Edit). + Lines( + MatchesRegexp("pick.*commit to fixup"), + MatchesRegexp("pick.*commit to drop"), + MatchesRegexp("pick.*second commit to edit"), + MatchesRegexp("pick.*commit to squash"), + MatchesRegexp("YOU ARE HERE.*first commit to edit").IsSelected(), + Contains("initial commit"), + ). + SelectPreviousItem(). + Press(keys.Commits.SquashDown). + Lines( + MatchesRegexp("pick.*commit to fixup"), + MatchesRegexp("pick.*commit to drop"), + MatchesRegexp("pick.*second commit to edit"), + MatchesRegexp("squash.*commit to squash").IsSelected(), + MatchesRegexp("YOU ARE HERE.*first commit to edit"), + Contains("initial commit"), + ). + SelectPreviousItem(). + Press(keys.Universal.Edit). + Lines( + MatchesRegexp("pick.*commit to fixup"), + MatchesRegexp("pick.*commit to drop"), + MatchesRegexp("edit.*second commit to edit").IsSelected(), + MatchesRegexp("squash.*commit to squash"), + MatchesRegexp("YOU ARE HERE.*first commit to edit"), + Contains("initial commit"), + ). + SelectPreviousItem(). + Press(keys.Universal.Remove). + Lines( + MatchesRegexp("pick.*commit to fixup"), + MatchesRegexp("drop.*commit to drop").IsSelected(), + MatchesRegexp("edit.*second commit to edit"), + MatchesRegexp("squash.*commit to squash"), + MatchesRegexp("YOU ARE HERE.*first commit to edit"), + Contains("initial commit"), + ). + SelectPreviousItem(). + Press(keys.Commits.MarkCommitAsFixup). + Lines( + MatchesRegexp("fixup.*commit to fixup").IsSelected(), + MatchesRegexp("drop.*commit to drop"), + MatchesRegexp("edit.*second commit to edit"), + MatchesRegexp("squash.*commit to squash"), + MatchesRegexp("YOU ARE HERE.*first commit to edit"), + Contains("initial commit"), + ). + Tap(func() { + t.Actions().ContinueRebase() + }). + Lines( + MatchesRegexp("fixup.*commit to fixup").IsSelected(), + MatchesRegexp("drop.*commit to drop"), + MatchesRegexp("YOU ARE HERE.*second commit to edit"), + MatchesRegexp("first commit to edit"), + Contains("initial commit"), + ). + Tap(func() { + t.Actions().ContinueRebase() + }). + Lines( + Contains("second commit to edit").IsSelected(), + Contains("first commit to edit"), + Contains("initial commit"), + ). + Tap(func() { + // commit 4 was squashed into 6 so we assert that their messages have been concatenated + t.Views().Main().Content( + Contains("second commit to edit"). + // file from fixup commit is present + Contains("fixup-commit-file"). + // but message is not (because it's a fixup, not a squash) + DoesNotContain("commit to fixup"), + ) + }). + SelectNextItem(). + Tap(func() { + // commit 4 was squashed into 6 so we assert that their messages have been concatenated + t.Views().Main().Content( + Contains("first commit to edit"). + // message from squashed commit has been concatenated with message other commit + Contains("commit to squash"), + ) + }) + }, +}) diff --git a/pkg/integration/tests/interactive_rebase/reword_first_commit.go b/pkg/integration/tests/interactive_rebase/reword_first_commit.go index 9e631da09..d4835fcd8 100644 --- a/pkg/integration/tests/interactive_rebase/reword_first_commit.go +++ b/pkg/integration/tests/interactive_rebase/reword_first_commit.go @@ -5,6 +5,9 @@ import ( . "github.com/jesseduffield/lazygit/pkg/integration/components" ) +// Rewording the first commit is tricky because you can't rebase from its parent commit, +// hence having a specific test for this + var RewordFirstCommit = NewIntegrationTest(NewIntegrationTestArgs{ Description: "Rewords the first commit, just to show that it's possible", ExtraCmdArgs: "", diff --git a/pkg/integration/tests/interactive_rebase/reword_last_commit.go b/pkg/integration/tests/interactive_rebase/reword_last_commit.go new file mode 100644 index 000000000..9a4329219 --- /dev/null +++ b/pkg/integration/tests/interactive_rebase/reword_last_commit.go @@ -0,0 +1,38 @@ +package interactive_rebase + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var RewordLastCommit = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Rewords the last (HEAD) commit", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell. + CreateNCommits(2) + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Lines( + Contains("commit 02").IsSelected(), + Contains("commit 01"), + ). + Press(keys.Commits.RenameCommit). + Tap(func() { + t.ExpectPopup().Prompt(). + Title(Equals("reword commit")). + InitialText(Equals("commit 02")). + Clear(). + Type("renamed 02"). + Confirm() + }). + Lines( + Contains("renamed 02"), + Contains("commit 01"), + ) + }, +}) diff --git a/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go b/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go new file mode 100644 index 000000000..e177dd0cb --- /dev/null +++ b/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go @@ -0,0 +1,126 @@ +package interactive_rebase + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var SwapInRebaseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Via an edit-triggered rebase, swap two commits, causing a conflict. Then resolve the conflict and continue", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("myfile", "one") + shell.Commit("commit one") + shell.UpdateFileAndAdd("myfile", "two") + shell.Commit("commit two") + shell.UpdateFileAndAdd("myfile", "three") + shell.Commit("commit three") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Lines( + Contains("commit three").IsSelected(), + Contains("commit two"), + Contains("commit one"), + ). + NavigateToListItem(Contains("commit one")). + Press(keys.Universal.Edit). + Lines( + Contains("commit three"), + Contains("commit two"), + Contains("YOU ARE HERE").Contains("commit one").IsSelected(), + ). + SelectPreviousItem(). + Press(keys.Commits.MoveUpCommit). + Lines( + Contains("commit two").IsSelected(), + Contains("commit three"), + Contains("YOU ARE HERE").Contains("commit one"), + ). + Tap(func() { + t.Actions().ContinueRebase() + }) + + handleConflictsFromSwap(t) + }, +}) + +func handleConflictsFromSwap(t *TestDriver) { + continueMerge := func() { + t.ExpectPopup().Confirmation(). + Title(Equals("continue")). + Content(Contains("all merge conflicts resolved. Continue?")). + Confirm() + } + + acceptConflicts := func() { + t.ExpectPopup().Confirmation(). + Title(Equals("Auto-merge failed")). + Content(Contains("Conflicts!")). + Confirm() + } + + acceptConflicts() + + t.Views().Files(). + IsFocused(). + Lines( + Contains("UU myfile"), + ). + PressEnter() + + t.Views().MergeConflicts(). + IsFocused(). + TopLines( + Contains("<<<<<<< HEAD"), + Contains("one"), + Contains("======="), + Contains("three"), + Contains(">>>>>>>"), + ). + SelectNextItem(). + PressPrimaryAction() // pick "three" + + continueMerge() + + acceptConflicts() + + t.Views().Files(). + IsFocused(). + Lines( + Contains("UU myfile"), + ). + PressEnter() + + t.Views().MergeConflicts(). + IsFocused(). + TopLines( + Contains("<<<<<<< HEAD"), + Contains("three"), + Contains("======="), + Contains("two"), + Contains(">>>>>>>"), + ). + SelectNextItem(). + PressPrimaryAction() // pick "two" + + continueMerge() + + t.Views().Commits(). + Focus(). + Lines( + Contains("commit two").IsSelected(), + Contains("commit three"), + Contains("commit one"), + ). + Tap(func() { + t.Views().Main().Content(Contains("-three").Contains("+two")) + }). + SelectNextItem(). + Tap(func() { + t.Views().Main().Content(Contains("-one").Contains("+three")) + }) +} diff --git a/pkg/integration/tests/interactive_rebase/swap_with_conflict.go b/pkg/integration/tests/interactive_rebase/swap_with_conflict.go new file mode 100644 index 000000000..5f156a5c8 --- /dev/null +++ b/pkg/integration/tests/interactive_rebase/swap_with_conflict.go @@ -0,0 +1,33 @@ +package interactive_rebase + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var SwapWithConflict = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Directly swap two commits, causing a conflict. Then resolve the conflict and continue", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.CreateFileAndAdd("myfile", "one") + shell.Commit("commit one") + shell.UpdateFileAndAdd("myfile", "two") + shell.Commit("commit two") + shell.UpdateFileAndAdd("myfile", "three") + shell.Commit("commit three") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + t.Views().Commits(). + Focus(). + Lines( + Contains("commit three").IsSelected(), + Contains("commit two"), + Contains("commit one"), + ). + Press(keys.Commits.MoveDownCommit) + + handleConflictsFromSwap(t) + }, +}) diff --git a/pkg/integration/tests/tests_gen.go b/pkg/integration/tests/tests_gen.go index 6a8e8e5af..6a7e36373 100644 --- a/pkg/integration/tests/tests_gen.go +++ b/pkg/integration/tests/tests_gen.go @@ -74,11 +74,16 @@ var tests = []*components.IntegrationTest{ interactive_rebase.EditFirstCommit, interactive_rebase.FixupFirstCommit, interactive_rebase.FixupSecondCommit, - interactive_rebase.One, + interactive_rebase.Move, + interactive_rebase.MoveInRebase, + interactive_rebase.Rebase, interactive_rebase.RewordFirstCommit, + interactive_rebase.RewordLastCommit, interactive_rebase.SquashDownFirstCommit, interactive_rebase.SquashDownSecondCommit, interactive_rebase.SquashFixupsAboveFirstCommit, + interactive_rebase.SwapInRebaseWithConflict, + interactive_rebase.SwapWithConflict, misc.ConfirmOnQuit, misc.InitialOpen, patch_building.CopyPatchToClipboard, diff --git a/test/integration/rebase/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/rebase/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index bdc8c7f7b..000000000 --- a/test/integration/rebase/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1,30 +0,0 @@ -# This is a combination of 3 commits. -# This is the 1st commit message: - -file1 - -# This is the commit message #2: - -file2 - -# The commit message #3 will be skipped: - -# file4 - -# Please enter the commit message for your changes. Lines starting -# with '#' will be ignored, and an empty message aborts the commit. -# -# Date: Tue Apr 6 11:39:15 2021 +1000 -# -# interactive rebase in progress; onto ecfc580 -# Last commands done (3 commands done): -# squash faaf373 file2 -# fixup 578ebf1 file4 -# No commands remaining. -# You are currently rebasing branch 'master' on 'ecfc580'. -# -# Changes to be committed: -# new file: file1 -# new file: file2 -# new file: file4 -# diff --git a/test/integration/rebase/expected/repo/.git_keep/FETCH_HEAD b/test/integration/rebase/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/rebase/expected/repo/.git_keep/HEAD b/test/integration/rebase/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/rebase/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/rebase/expected/repo/.git_keep/ORIG_HEAD b/test/integration/rebase/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index a7cdb7ad7..000000000 --- a/test/integration/rebase/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -47614f63053804bc596291b8f7cff3b460b1b3ee diff --git a/test/integration/rebase/expected/repo/.git_keep/config b/test/integration/rebase/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/rebase/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/rebase/expected/repo/.git_keep/description b/test/integration/rebase/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/rebase/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/rebase/expected/repo/.git_keep/index b/test/integration/rebase/expected/repo/.git_keep/index deleted file mode 100644 index afd9d4a73..000000000 Binary files a/test/integration/rebase/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/rebase/expected/repo/.git_keep/info/exclude b/test/integration/rebase/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/rebase/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/rebase/expected/repo/.git_keep/logs/HEAD b/test/integration/rebase/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 33765d80e..000000000 --- a/test/integration/rebase/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,9 +0,0 @@ -0000000000000000000000000000000000000000 ecfc5809e3397bbda6bd4c9f47267a8c5f22346c CI 1617673155 +1000 commit (initial): file0 -ecfc5809e3397bbda6bd4c9f47267a8c5f22346c 47614f63053804bc596291b8f7cff3b460b1b3ee CI 1617673155 +1000 commit: file1 -47614f63053804bc596291b8f7cff3b460b1b3ee faaf373a925c1e335894ebf4343a00a917f04edc CI 1617673155 +1000 commit: file2 -faaf373a925c1e335894ebf4343a00a917f04edc 578ebf1736e797b78fb670c718ebf177936eb2ef CI 1617673155 +1000 commit: file4 -578ebf1736e797b78fb670c718ebf177936eb2ef ecfc5809e3397bbda6bd4c9f47267a8c5f22346c CI 1617673156 +1000 rebase -i (start): checkout ecfc5809e3397bbda6bd4c9f47267a8c5f22346c -ecfc5809e3397bbda6bd4c9f47267a8c5f22346c 47614f63053804bc596291b8f7cff3b460b1b3ee CI 1617673156 +1000 rebase -i: fast-forward -47614f63053804bc596291b8f7cff3b460b1b3ee e8ece6af94d443b67962124243509d8f61a29758 CI 1617673159 +1000 rebase -i (squash): # This is a combination of 2 commits. -e8ece6af94d443b67962124243509d8f61a29758 1824d7294d6d3524d83510db27086177a6db97bf CI 1617673159 +1000 rebase -i (fixup): file1 -1824d7294d6d3524d83510db27086177a6db97bf 1824d7294d6d3524d83510db27086177a6db97bf CI 1617673159 +1000 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/rebase/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/rebase/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 5fc8a0547..000000000 --- a/test/integration/rebase/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 ecfc5809e3397bbda6bd4c9f47267a8c5f22346c CI 1617673155 +1000 commit (initial): file0 -ecfc5809e3397bbda6bd4c9f47267a8c5f22346c 47614f63053804bc596291b8f7cff3b460b1b3ee CI 1617673155 +1000 commit: file1 -47614f63053804bc596291b8f7cff3b460b1b3ee faaf373a925c1e335894ebf4343a00a917f04edc CI 1617673155 +1000 commit: file2 -faaf373a925c1e335894ebf4343a00a917f04edc 578ebf1736e797b78fb670c718ebf177936eb2ef CI 1617673155 +1000 commit: file4 -578ebf1736e797b78fb670c718ebf177936eb2ef 1824d7294d6d3524d83510db27086177a6db97bf CI 1617673159 +1000 rebase -i (finish): refs/heads/master onto ecfc5809e3397bbda6bd4c9f47267a8c5f22346c diff --git a/test/integration/rebase/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/rebase/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/rebase/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/rebase/expected/repo/.git_keep/objects/18/24d7294d6d3524d83510db27086177a6db97bf b/test/integration/rebase/expected/repo/.git_keep/objects/18/24d7294d6d3524d83510db27086177a6db97bf deleted file mode 100644 index c3cd3b608..000000000 Binary files a/test/integration/rebase/expected/repo/.git_keep/objects/18/24d7294d6d3524d83510db27086177a6db97bf and /dev/null differ diff --git a/test/integration/rebase/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/rebase/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67..000000000 Binary files a/test/integration/rebase/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 and /dev/null differ diff --git a/test/integration/rebase/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/rebase/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d..000000000 Binary files a/test/integration/rebase/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da and /dev/null differ diff --git a/test/integration/rebase/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 b/test/integration/rebase/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 deleted file mode 100644 index 39b5247e9..000000000 Binary files a/test/integration/rebase/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 and /dev/null differ diff --git a/test/integration/rebase/expected/repo/.git_keep/objects/47/614f63053804bc596291b8f7cff3b460b1b3ee b/test/integration/rebase/expected/repo/.git_keep/objects/47/614f63053804bc596291b8f7cff3b460b1b3ee deleted file mode 100644 index 466d05a3c..000000000 Binary files a/test/integration/rebase/expected/repo/.git_keep/objects/47/614f63053804bc596291b8f7cff3b460b1b3ee and /dev/null differ diff --git a/test/integration/rebase/expected/repo/.git_keep/objects/57/8ebf1736e797b78fb670c718ebf177936eb2ef b/test/integration/rebase/expected/repo/.git_keep/objects/57/8ebf1736e797b78fb670c718ebf177936eb2ef deleted file mode 100644 index 794aeab98..000000000 Binary files a/test/integration/rebase/expected/repo/.git_keep/objects/57/8ebf1736e797b78fb670c718ebf177936eb2ef and /dev/null differ diff --git a/test/integration/rebase/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/rebase/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06d..000000000 Binary files a/test/integration/rebase/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c and /dev/null differ diff --git a/test/integration/rebase/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/rebase/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/rebase/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/rebase/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/rebase/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/rebase/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/rebase/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/rebase/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/rebase/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/rebase/expected/repo/.git_keep/objects/e8/ece6af94d443b67962124243509d8f61a29758 b/test/integration/rebase/expected/repo/.git_keep/objects/e8/ece6af94d443b67962124243509d8f61a29758 deleted file mode 100644 index 1e37ae032..000000000 --- a/test/integration/rebase/expected/repo/.git_keep/objects/e8/ece6af94d443b67962124243509d8f61a29758 +++ /dev/null @@ -1,3 +0,0 @@ -xj1 Ю, +*l˝x)n -Z]]k)KS߈shy.9r\XC:I(!$4!MJcET }\rFX+3Zó:qRWW03h}_ANF? -r}yy_ \ No newline at end of file diff --git a/test/integration/rebase/expected/repo/.git_keep/objects/ec/fc5809e3397bbda6bd4c9f47267a8c5f22346c b/test/integration/rebase/expected/repo/.git_keep/objects/ec/fc5809e3397bbda6bd4c9f47267a8c5f22346c deleted file mode 100644 index 2d6a8e55b..000000000 Binary files a/test/integration/rebase/expected/repo/.git_keep/objects/ec/fc5809e3397bbda6bd4c9f47267a8c5f22346c and /dev/null differ diff --git a/test/integration/rebase/expected/repo/.git_keep/objects/fa/af373a925c1e335894ebf4343a00a917f04edc b/test/integration/rebase/expected/repo/.git_keep/objects/fa/af373a925c1e335894ebf4343a00a917f04edc deleted file mode 100644 index 2b9668ea1..000000000 Binary files a/test/integration/rebase/expected/repo/.git_keep/objects/fa/af373a925c1e335894ebf4343a00a917f04edc and /dev/null differ diff --git a/test/integration/rebase/expected/repo/.git_keep/refs/heads/master b/test/integration/rebase/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 19cc8c02c..000000000 --- a/test/integration/rebase/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -1824d7294d6d3524d83510db27086177a6db97bf diff --git a/test/integration/rebase/expected/repo/file0 b/test/integration/rebase/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/rebase/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/rebase/expected/repo/file1 b/test/integration/rebase/expected/repo/file1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/rebase/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/rebase/expected/repo/file2 b/test/integration/rebase/expected/repo/file2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/rebase/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/rebase/expected/repo/file4 b/test/integration/rebase/expected/repo/file4 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/rebase/expected/repo/file4 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/rebase/recording.json b/test/integration/rebase/recording.json deleted file mode 100644 index 8c1042333..000000000 --- a/test/integration/rebase/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":595,"Mod":0,"Key":259,"Ch":0},{"Timestamp":780,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1044,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1187,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1483,"Mod":0,"Key":256,"Ch":101},{"Timestamp":2492,"Mod":0,"Key":257,"Ch":0},{"Timestamp":2763,"Mod":0,"Key":256,"Ch":115},{"Timestamp":3125,"Mod":0,"Key":257,"Ch":0},{"Timestamp":3419,"Mod":0,"Key":256,"Ch":102},{"Timestamp":4132,"Mod":0,"Key":256,"Ch":109},{"Timestamp":4555,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5260,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/rebase/setup.sh b/test/integration/rebase/setup.sh deleted file mode 100644 index 8806332fd..000000000 --- a/test/integration/rebase/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/rebase/test.json b/test/integration/rebase/test.json deleted file mode 100644 index 20830b099..000000000 --- a/test/integration/rebase/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "basic rebase of commits", "speed": 10 } diff --git a/test/integration/rebase2/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/rebase2/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index b6651993b..000000000 --- a/test/integration/rebase2/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1,16 +0,0 @@ -file4-changed-again - -# Please enter the commit message for your changes. Lines starting -# with '#' will be ignored, and an empty message aborts the commit. -# -# interactive rebase in progress; onto 4aedafb -# Last commands done (2 commands done): -# edit 26d430f file4-added -# pick c390128 file4-changed-again -# Next command to do (1 remaining command): -# pick bce4745 file4-changed -# You are currently rebasing branch 'master' on '4aedafb'. -# -# Changes to be committed: -# modified: file4 -# diff --git a/test/integration/rebase2/expected/repo/.git_keep/FETCH_HEAD b/test/integration/rebase2/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/rebase2/expected/repo/.git_keep/HEAD b/test/integration/rebase2/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/rebase2/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/rebase2/expected/repo/.git_keep/MERGE_MSG b/test/integration/rebase2/expected/repo/.git_keep/MERGE_MSG deleted file mode 100644 index ebd2bf400..000000000 --- a/test/integration/rebase2/expected/repo/.git_keep/MERGE_MSG +++ /dev/null @@ -1,4 +0,0 @@ -file4-changed - -# Conflicts: -# file4 diff --git a/test/integration/rebase2/expected/repo/.git_keep/ORIG_HEAD b/test/integration/rebase2/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 35cc5f3a8..000000000 --- a/test/integration/rebase2/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -26d430fb59900099e9992a3c79f30e42309cdce3 diff --git a/test/integration/rebase2/expected/repo/.git_keep/REBASE_HEAD b/test/integration/rebase2/expected/repo/.git_keep/REBASE_HEAD deleted file mode 100644 index 5474caaf2..000000000 --- a/test/integration/rebase2/expected/repo/.git_keep/REBASE_HEAD +++ /dev/null @@ -1 +0,0 @@ -bce4745137c540943900ca78e4b31dd1315bf57c diff --git a/test/integration/rebase2/expected/repo/.git_keep/config b/test/integration/rebase2/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/rebase2/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/rebase2/expected/repo/.git_keep/description b/test/integration/rebase2/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/rebase2/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/rebase2/expected/repo/.git_keep/index b/test/integration/rebase2/expected/repo/.git_keep/index deleted file mode 100644 index ce2357503..000000000 Binary files a/test/integration/rebase2/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/rebase2/expected/repo/.git_keep/info/exclude b/test/integration/rebase2/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/rebase2/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/rebase2/expected/repo/.git_keep/logs/HEAD b/test/integration/rebase2/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 5b27757c9..000000000 --- a/test/integration/rebase2/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,10 +0,0 @@ -0000000000000000000000000000000000000000 f94292928d0bc034fe88c753306b1959300e1264 CI 1617673301 +1000 commit (initial): file0 -f94292928d0bc034fe88c753306b1959300e1264 61baf480bb5ddfad6d66c785b321d4aadd5367b4 CI 1617673301 +1000 commit: file1 -61baf480bb5ddfad6d66c785b321d4aadd5367b4 4aedafb1a5d371825cbfea5ffcf2692cc786a1bf CI 1617673301 +1000 commit: file2 -4aedafb1a5d371825cbfea5ffcf2692cc786a1bf 26d430fb59900099e9992a3c79f30e42309cdce3 CI 1617673301 +1000 commit: file4-added -26d430fb59900099e9992a3c79f30e42309cdce3 bce4745137c540943900ca78e4b31dd1315bf57c CI 1617673301 +1000 commit: file4-changed -bce4745137c540943900ca78e4b31dd1315bf57c c3901284a9e7fc063d6fa7f0c5797d031445ba45 CI 1617673301 +1000 commit: file4-changed-again -c3901284a9e7fc063d6fa7f0c5797d031445ba45 4aedafb1a5d371825cbfea5ffcf2692cc786a1bf CI 1617673303 +1000 rebase -i (start): checkout 4aedafb1a5d371825cbfea5ffcf2692cc786a1bf -4aedafb1a5d371825cbfea5ffcf2692cc786a1bf 26d430fb59900099e9992a3c79f30e42309cdce3 CI 1617673303 +1000 rebase -i: fast-forward -26d430fb59900099e9992a3c79f30e42309cdce3 c36e808d2fa61e16952b7d0ffb8f18d08156cc94 CI 1617673309 +1000 rebase -i (continue): file4-changed-again -c36e808d2fa61e16952b7d0ffb8f18d08156cc94 c36e808d2fa61e16952b7d0ffb8f18d08156cc94 CI 1617673311 +1000 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/rebase2/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/rebase2/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 755240ff0..000000000 --- a/test/integration/rebase2/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 f94292928d0bc034fe88c753306b1959300e1264 CI 1617673301 +1000 commit (initial): file0 -f94292928d0bc034fe88c753306b1959300e1264 61baf480bb5ddfad6d66c785b321d4aadd5367b4 CI 1617673301 +1000 commit: file1 -61baf480bb5ddfad6d66c785b321d4aadd5367b4 4aedafb1a5d371825cbfea5ffcf2692cc786a1bf CI 1617673301 +1000 commit: file2 -4aedafb1a5d371825cbfea5ffcf2692cc786a1bf 26d430fb59900099e9992a3c79f30e42309cdce3 CI 1617673301 +1000 commit: file4-added -26d430fb59900099e9992a3c79f30e42309cdce3 bce4745137c540943900ca78e4b31dd1315bf57c CI 1617673301 +1000 commit: file4-changed -bce4745137c540943900ca78e4b31dd1315bf57c c3901284a9e7fc063d6fa7f0c5797d031445ba45 CI 1617673301 +1000 commit: file4-changed-again -c3901284a9e7fc063d6fa7f0c5797d031445ba45 c36e808d2fa61e16952b7d0ffb8f18d08156cc94 CI 1617673311 +1000 rebase -i (finish): refs/heads/master onto 4aedafb1a5d371825cbfea5ffcf2692cc786a1bf diff --git a/test/integration/rebase2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/rebase2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/rebase2/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/rebase2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/rebase2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67..000000000 Binary files a/test/integration/rebase2/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 and /dev/null differ diff --git a/test/integration/rebase2/expected/repo/.git_keep/objects/26/d430fb59900099e9992a3c79f30e42309cdce3 b/test/integration/rebase2/expected/repo/.git_keep/objects/26/d430fb59900099e9992a3c79f30e42309cdce3 deleted file mode 100644 index d2eef9a41..000000000 --- a/test/integration/rebase2/expected/repo/.git_keep/objects/26/d430fb59900099e9992a3c79f30e42309cdce3 +++ /dev/null @@ -1,3 +0,0 @@ -xM -0@a9Ed]d Ɩ#}|Wޗ!ؙ5"{УK"80@D-[ȹpjC#q#)@ZɋT!Zc -E}s44?K}{!@ 9 ucj\bPk <9 \ No newline at end of file diff --git a/test/integration/rebase2/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/rebase2/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d..000000000 Binary files a/test/integration/rebase2/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da and /dev/null differ diff --git a/test/integration/rebase2/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 b/test/integration/rebase2/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 deleted file mode 100644 index 39b5247e9..000000000 Binary files a/test/integration/rebase2/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 and /dev/null differ diff --git a/test/integration/rebase2/expected/repo/.git_keep/objects/4a/edafb1a5d371825cbfea5ffcf2692cc786a1bf b/test/integration/rebase2/expected/repo/.git_keep/objects/4a/edafb1a5d371825cbfea5ffcf2692cc786a1bf deleted file mode 100644 index 312cef408..000000000 Binary files a/test/integration/rebase2/expected/repo/.git_keep/objects/4a/edafb1a5d371825cbfea5ffcf2692cc786a1bf and /dev/null differ diff --git a/test/integration/rebase2/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f b/test/integration/rebase2/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f deleted file mode 100644 index 953241815..000000000 Binary files a/test/integration/rebase2/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f and /dev/null differ diff --git a/test/integration/rebase2/expected/repo/.git_keep/objects/61/baf480bb5ddfad6d66c785b321d4aadd5367b4 b/test/integration/rebase2/expected/repo/.git_keep/objects/61/baf480bb5ddfad6d66c785b321d4aadd5367b4 deleted file mode 100644 index 63f61eda9..000000000 --- a/test/integration/rebase2/expected/repo/.git_keep/objects/61/baf480bb5ddfad6d66c785b321d4aadd5367b4 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0E]d&I]dƖ#}އ'{kb{i*dAEd ex(٩u<wrg̸:_t% QoҧoǦ7(P _=韺)d~*<8 \ No newline at end of file diff --git a/test/integration/rebase2/expected/repo/.git_keep/objects/8d/3ce0d821345b25fef1188e48cba4a1d44c30be b/test/integration/rebase2/expected/repo/.git_keep/objects/8d/3ce0d821345b25fef1188e48cba4a1d44c30be deleted file mode 100644 index 74d27cc54..000000000 Binary files a/test/integration/rebase2/expected/repo/.git_keep/objects/8d/3ce0d821345b25fef1188e48cba4a1d44c30be and /dev/null differ diff --git a/test/integration/rebase2/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/rebase2/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06d..000000000 Binary files a/test/integration/rebase2/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c and /dev/null differ diff --git a/test/integration/rebase2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/rebase2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/rebase2/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/rebase2/expected/repo/.git_keep/objects/bb/c22338ee174004f5c5fa117688249bc5b7e205 b/test/integration/rebase2/expected/repo/.git_keep/objects/bb/c22338ee174004f5c5fa117688249bc5b7e205 deleted file mode 100644 index 44282752c..000000000 Binary files a/test/integration/rebase2/expected/repo/.git_keep/objects/bb/c22338ee174004f5c5fa117688249bc5b7e205 and /dev/null differ diff --git a/test/integration/rebase2/expected/repo/.git_keep/objects/bc/e4745137c540943900ca78e4b31dd1315bf57c b/test/integration/rebase2/expected/repo/.git_keep/objects/bc/e4745137c540943900ca78e4b31dd1315bf57c deleted file mode 100644 index 6b9a1097f..000000000 Binary files a/test/integration/rebase2/expected/repo/.git_keep/objects/bc/e4745137c540943900ca78e4b31dd1315bf57c and /dev/null differ diff --git a/test/integration/rebase2/expected/repo/.git_keep/objects/c3/6e808d2fa61e16952b7d0ffb8f18d08156cc94 b/test/integration/rebase2/expected/repo/.git_keep/objects/c3/6e808d2fa61e16952b7d0ffb8f18d08156cc94 deleted file mode 100644 index 94af91a3e..000000000 Binary files a/test/integration/rebase2/expected/repo/.git_keep/objects/c3/6e808d2fa61e16952b7d0ffb8f18d08156cc94 and /dev/null differ diff --git a/test/integration/rebase2/expected/repo/.git_keep/objects/c3/901284a9e7fc063d6fa7f0c5797d031445ba45 b/test/integration/rebase2/expected/repo/.git_keep/objects/c3/901284a9e7fc063d6fa7f0c5797d031445ba45 deleted file mode 100644 index 3eb14d8c9..000000000 Binary files a/test/integration/rebase2/expected/repo/.git_keep/objects/c3/901284a9e7fc063d6fa7f0c5797d031445ba45 and /dev/null differ diff --git a/test/integration/rebase2/expected/repo/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 b/test/integration/rebase2/expected/repo/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 deleted file mode 100644 index f390e4e4d..000000000 Binary files a/test/integration/rebase2/expected/repo/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 and /dev/null differ diff --git a/test/integration/rebase2/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/rebase2/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/rebase2/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/rebase2/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/rebase2/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/rebase2/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/rebase2/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/rebase2/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/rebase2/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/rebase2/expected/repo/.git_keep/objects/f9/4292928d0bc034fe88c753306b1959300e1264 b/test/integration/rebase2/expected/repo/.git_keep/objects/f9/4292928d0bc034fe88c753306b1959300e1264 deleted file mode 100644 index db145ed54..000000000 --- a/test/integration/rebase2/expected/repo/.git_keep/objects/f9/4292928d0bc034fe88c753306b1959300e1264 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0Fa9IĀU4)<=o魭D4v>cr >VTQ՚4}pYz{x >8Bgafsc2'7uو+ \ No newline at end of file diff --git a/test/integration/rebase2/expected/repo/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 b/test/integration/rebase2/expected/repo/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 deleted file mode 100644 index f082bca50..000000000 Binary files a/test/integration/rebase2/expected/repo/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 and /dev/null differ diff --git a/test/integration/rebase2/expected/repo/.git_keep/refs/heads/master b/test/integration/rebase2/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 770158eac..000000000 --- a/test/integration/rebase2/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -c36e808d2fa61e16952b7d0ffb8f18d08156cc94 diff --git a/test/integration/rebase2/expected/repo/file0 b/test/integration/rebase2/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/rebase2/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/rebase2/expected/repo/file1 b/test/integration/rebase2/expected/repo/file1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/rebase2/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/rebase2/expected/repo/file2 b/test/integration/rebase2/expected/repo/file2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/rebase2/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/rebase2/expected/repo/file4 b/test/integration/rebase2/expected/repo/file4 deleted file mode 100644 index 4f346f1ad..000000000 --- a/test/integration/rebase2/expected/repo/file4 +++ /dev/null @@ -1 +0,0 @@ -test5 diff --git a/test/integration/rebase2/recording.json b/test/integration/rebase2/recording.json deleted file mode 100644 index ae400b11b..000000000 --- a/test/integration/rebase2/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":507,"Mod":0,"Key":259,"Ch":0},{"Timestamp":707,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1051,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1204,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1460,"Mod":0,"Key":256,"Ch":101},{"Timestamp":1948,"Mod":0,"Key":257,"Ch":0},{"Timestamp":2091,"Mod":0,"Key":257,"Ch":0},{"Timestamp":2828,"Mod":2,"Key":10,"Ch":10},{"Timestamp":4219,"Mod":0,"Key":256,"Ch":109},{"Timestamp":4476,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5524,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6116,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6405,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6635,"Mod":0,"Key":256,"Ch":32},{"Timestamp":7292,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8147,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8548,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8891,"Mod":0,"Key":257,"Ch":0},{"Timestamp":9155,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9707,"Mod":0,"Key":13,"Ch":13},{"Timestamp":10636,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/rebase2/setup.sh b/test/integration/rebase2/setup.sh deleted file mode 100644 index 99c030a87..000000000 --- a/test/integration/rebase2/setup.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -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-added - -echo test4 > file4 -git add . -git commit -am file4-changed - -echo test5 > file4 -git add . -git commit -am file4-changed-again diff --git a/test/integration/rebase2/test.json b/test/integration/rebase2/test.json deleted file mode 100644 index e6d67fff1..000000000 --- a/test/integration/rebase2/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "rebasing by reordering two commits, causing a merge conflict", "speed": 10 } diff --git a/test/integration/rebase3/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/rebase3/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 1595e626c..000000000 --- a/test/integration/rebase3/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1,27 +0,0 @@ -# This is a combination of 2 commits. -# This is the 1st commit message: - -file1 - -# This is the commit message #2: - -file2 - -# Please enter the commit message for your changes. Lines starting -# with '#' will be ignored, and an empty message aborts the commit. -# -# Date: Tue Apr 6 11:43:21 2021 +1000 -# -# interactive rebase in progress; onto fdecf9e -# Last commands done (2 commands done): -# edit f06dfb4 file1 -# squash 51a0e4a file2 -# Next commands to do (3 remaining commands): -# edit d8ae31f file4-added -# fixup 4bf6ae4 file4-changed -# You are currently rebasing branch 'master' on 'fdecf9e'. -# -# Changes to be committed: -# new file: file1 -# new file: file2 -# diff --git a/test/integration/rebase3/expected/repo/.git_keep/FETCH_HEAD b/test/integration/rebase3/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/rebase3/expected/repo/.git_keep/HEAD b/test/integration/rebase3/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/rebase3/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/rebase3/expected/repo/.git_keep/ORIG_HEAD b/test/integration/rebase3/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 2409d6732..000000000 --- a/test/integration/rebase3/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -9e68fbe4291e7416d50587d9b6968aa5ceeccff9 diff --git a/test/integration/rebase3/expected/repo/.git_keep/config b/test/integration/rebase3/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/rebase3/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/rebase3/expected/repo/.git_keep/description b/test/integration/rebase3/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/rebase3/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/rebase3/expected/repo/.git_keep/index b/test/integration/rebase3/expected/repo/.git_keep/index deleted file mode 100644 index efd9ed8a3..000000000 Binary files a/test/integration/rebase3/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/rebase3/expected/repo/.git_keep/info/exclude b/test/integration/rebase3/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/rebase3/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/rebase3/expected/repo/.git_keep/logs/HEAD b/test/integration/rebase3/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 8f0d70d47..000000000 --- a/test/integration/rebase3/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,12 +0,0 @@ -0000000000000000000000000000000000000000 fdecf9e3e742db4c8690d56b328b2533e67d2866 CI 1617673401 +1000 commit (initial): file0 -fdecf9e3e742db4c8690d56b328b2533e67d2866 f06dfb4e9e5a9dfab869590058f2c1ce1c72b2ac CI 1617673401 +1000 commit: file1 -f06dfb4e9e5a9dfab869590058f2c1ce1c72b2ac 51a0e4a6635c22a062a48b7134dd556541a1e06c CI 1617673401 +1000 commit: file2 -51a0e4a6635c22a062a48b7134dd556541a1e06c d8ae31faf375fd293cedb0c88c41a9c7a77a2530 CI 1617673401 +1000 commit: file4-added -d8ae31faf375fd293cedb0c88c41a9c7a77a2530 4bf6ae41c5ef2186c87f5f39dbb8cadd76c597cc CI 1617673401 +1000 commit: file4-changed -4bf6ae41c5ef2186c87f5f39dbb8cadd76c597cc 9e68fbe4291e7416d50587d9b6968aa5ceeccff9 CI 1617673401 +1000 commit: file4-changed-again -9e68fbe4291e7416d50587d9b6968aa5ceeccff9 fdecf9e3e742db4c8690d56b328b2533e67d2866 CI 1617673403 +1000 rebase -i (start): checkout fdecf9e3e742db4c8690d56b328b2533e67d2866 -fdecf9e3e742db4c8690d56b328b2533e67d2866 f06dfb4e9e5a9dfab869590058f2c1ce1c72b2ac CI 1617673403 +1000 rebase -i: fast-forward -f06dfb4e9e5a9dfab869590058f2c1ce1c72b2ac 7b42ba8a9f370bbbf0db85c5aca61f4e8a7b3d26 CI 1617673407 +1000 rebase -i (squash): file1 -7b42ba8a9f370bbbf0db85c5aca61f4e8a7b3d26 8f2acebb8a7a83cfaf3cffc6a9103f633f5cf292 CI 1617673407 +1000 rebase -i (edit): file4-added -8f2acebb8a7a83cfaf3cffc6a9103f633f5cf292 3c21f03d819ae34b74084712c3ef1b9b99b2f40e CI 1617673409 +1000 rebase -i (fixup): file4-added -3c21f03d819ae34b74084712c3ef1b9b99b2f40e 3c21f03d819ae34b74084712c3ef1b9b99b2f40e CI 1617673409 +1000 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/rebase3/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/rebase3/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index b2e06daa1..000000000 --- a/test/integration/rebase3/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 fdecf9e3e742db4c8690d56b328b2533e67d2866 CI 1617673401 +1000 commit (initial): file0 -fdecf9e3e742db4c8690d56b328b2533e67d2866 f06dfb4e9e5a9dfab869590058f2c1ce1c72b2ac CI 1617673401 +1000 commit: file1 -f06dfb4e9e5a9dfab869590058f2c1ce1c72b2ac 51a0e4a6635c22a062a48b7134dd556541a1e06c CI 1617673401 +1000 commit: file2 -51a0e4a6635c22a062a48b7134dd556541a1e06c d8ae31faf375fd293cedb0c88c41a9c7a77a2530 CI 1617673401 +1000 commit: file4-added -d8ae31faf375fd293cedb0c88c41a9c7a77a2530 4bf6ae41c5ef2186c87f5f39dbb8cadd76c597cc CI 1617673401 +1000 commit: file4-changed -4bf6ae41c5ef2186c87f5f39dbb8cadd76c597cc 9e68fbe4291e7416d50587d9b6968aa5ceeccff9 CI 1617673401 +1000 commit: file4-changed-again -9e68fbe4291e7416d50587d9b6968aa5ceeccff9 3c21f03d819ae34b74084712c3ef1b9b99b2f40e CI 1617673409 +1000 rebase -i (finish): refs/heads/master onto fdecf9e3e742db4c8690d56b328b2533e67d2866 diff --git a/test/integration/rebase3/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/rebase3/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/rebase3/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/rebase3/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/rebase3/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67..000000000 Binary files a/test/integration/rebase3/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 and /dev/null differ diff --git a/test/integration/rebase3/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/rebase3/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d..000000000 Binary files a/test/integration/rebase3/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da and /dev/null differ diff --git a/test/integration/rebase3/expected/repo/.git_keep/objects/3c/21f03d819ae34b74084712c3ef1b9b99b2f40e b/test/integration/rebase3/expected/repo/.git_keep/objects/3c/21f03d819ae34b74084712c3ef1b9b99b2f40e deleted file mode 100644 index 5ddde579a..000000000 Binary files a/test/integration/rebase3/expected/repo/.git_keep/objects/3c/21f03d819ae34b74084712c3ef1b9b99b2f40e and /dev/null differ diff --git a/test/integration/rebase3/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 b/test/integration/rebase3/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 deleted file mode 100644 index 39b5247e9..000000000 Binary files a/test/integration/rebase3/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 and /dev/null differ diff --git a/test/integration/rebase3/expected/repo/.git_keep/objects/4b/f6ae41c5ef2186c87f5f39dbb8cadd76c597cc b/test/integration/rebase3/expected/repo/.git_keep/objects/4b/f6ae41c5ef2186c87f5f39dbb8cadd76c597cc deleted file mode 100644 index 5525e133d..000000000 Binary files a/test/integration/rebase3/expected/repo/.git_keep/objects/4b/f6ae41c5ef2186c87f5f39dbb8cadd76c597cc and /dev/null differ diff --git a/test/integration/rebase3/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f b/test/integration/rebase3/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f deleted file mode 100644 index 953241815..000000000 Binary files a/test/integration/rebase3/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f and /dev/null differ diff --git a/test/integration/rebase3/expected/repo/.git_keep/objects/51/a0e4a6635c22a062a48b7134dd556541a1e06c b/test/integration/rebase3/expected/repo/.git_keep/objects/51/a0e4a6635c22a062a48b7134dd556541a1e06c deleted file mode 100644 index 3cae162a5..000000000 Binary files a/test/integration/rebase3/expected/repo/.git_keep/objects/51/a0e4a6635c22a062a48b7134dd556541a1e06c and /dev/null differ diff --git a/test/integration/rebase3/expected/repo/.git_keep/objects/7b/42ba8a9f370bbbf0db85c5aca61f4e8a7b3d26 b/test/integration/rebase3/expected/repo/.git_keep/objects/7b/42ba8a9f370bbbf0db85c5aca61f4e8a7b3d26 deleted file mode 100644 index c274ef42a..000000000 Binary files a/test/integration/rebase3/expected/repo/.git_keep/objects/7b/42ba8a9f370bbbf0db85c5aca61f4e8a7b3d26 and /dev/null differ diff --git a/test/integration/rebase3/expected/repo/.git_keep/objects/8f/2acebb8a7a83cfaf3cffc6a9103f633f5cf292 b/test/integration/rebase3/expected/repo/.git_keep/objects/8f/2acebb8a7a83cfaf3cffc6a9103f633f5cf292 deleted file mode 100644 index 60af8bec0..000000000 Binary files a/test/integration/rebase3/expected/repo/.git_keep/objects/8f/2acebb8a7a83cfaf3cffc6a9103f633f5cf292 and /dev/null differ diff --git a/test/integration/rebase3/expected/repo/.git_keep/objects/9e/68fbe4291e7416d50587d9b6968aa5ceeccff9 b/test/integration/rebase3/expected/repo/.git_keep/objects/9e/68fbe4291e7416d50587d9b6968aa5ceeccff9 deleted file mode 100644 index f57e0bee5..000000000 Binary files a/test/integration/rebase3/expected/repo/.git_keep/objects/9e/68fbe4291e7416d50587d9b6968aa5ceeccff9 and /dev/null differ diff --git a/test/integration/rebase3/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/rebase3/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06d..000000000 Binary files a/test/integration/rebase3/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c and /dev/null differ diff --git a/test/integration/rebase3/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/rebase3/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/rebase3/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/rebase3/expected/repo/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 b/test/integration/rebase3/expected/repo/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 deleted file mode 100644 index f390e4e4d..000000000 Binary files a/test/integration/rebase3/expected/repo/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 and /dev/null differ diff --git a/test/integration/rebase3/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/rebase3/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/rebase3/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/rebase3/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/rebase3/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/rebase3/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/rebase3/expected/repo/.git_keep/objects/d8/ae31faf375fd293cedb0c88c41a9c7a77a2530 b/test/integration/rebase3/expected/repo/.git_keep/objects/d8/ae31faf375fd293cedb0c88c41a9c7a77a2530 deleted file mode 100644 index c24f2b41a..000000000 Binary files a/test/integration/rebase3/expected/repo/.git_keep/objects/d8/ae31faf375fd293cedb0c88c41a9c7a77a2530 and /dev/null differ diff --git a/test/integration/rebase3/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/rebase3/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/rebase3/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/rebase3/expected/repo/.git_keep/objects/f0/6dfb4e9e5a9dfab869590058f2c1ce1c72b2ac b/test/integration/rebase3/expected/repo/.git_keep/objects/f0/6dfb4e9e5a9dfab869590058f2c1ce1c72b2ac deleted file mode 100644 index 3f5ed1e60..000000000 --- a/test/integration/rebase3/expected/repo/.git_keep/objects/f0/6dfb4e9e5a9dfab869590058f2c1ce1c72b2ac +++ /dev/null @@ -1,4 +0,0 @@ -xA - @Ѯ= etBV9# & =~sn?oekm`C -" -qRj!ugo͞}wEF% ޕeeLnn Rō&}k;`>Oz= ȣEDsseUk~Z9 \ No newline at end of file diff --git a/test/integration/rebase3/expected/repo/.git_keep/objects/fd/ecf9e3e742db4c8690d56b328b2533e67d2866 b/test/integration/rebase3/expected/repo/.git_keep/objects/fd/ecf9e3e742db4c8690d56b328b2533e67d2866 deleted file mode 100644 index ecf41f692..000000000 Binary files a/test/integration/rebase3/expected/repo/.git_keep/objects/fd/ecf9e3e742db4c8690d56b328b2533e67d2866 and /dev/null differ diff --git a/test/integration/rebase3/expected/repo/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 b/test/integration/rebase3/expected/repo/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 deleted file mode 100644 index f082bca50..000000000 Binary files a/test/integration/rebase3/expected/repo/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 and /dev/null differ diff --git a/test/integration/rebase3/expected/repo/.git_keep/refs/heads/master b/test/integration/rebase3/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 7946e55f6..000000000 --- a/test/integration/rebase3/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -3c21f03d819ae34b74084712c3ef1b9b99b2f40e diff --git a/test/integration/rebase3/expected/repo/file0 b/test/integration/rebase3/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/rebase3/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/rebase3/expected/repo/file1 b/test/integration/rebase3/expected/repo/file1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/rebase3/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/rebase3/expected/repo/file2 b/test/integration/rebase3/expected/repo/file2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/rebase3/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/rebase3/expected/repo/file4 b/test/integration/rebase3/expected/repo/file4 deleted file mode 100644 index d234c5e05..000000000 --- a/test/integration/rebase3/expected/repo/file4 +++ /dev/null @@ -1 +0,0 @@ -test4 diff --git a/test/integration/rebase3/recording.json b/test/integration/rebase3/recording.json deleted file mode 100644 index 85172e33b..000000000 --- a/test/integration/rebase3/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":469,"Mod":0,"Key":259,"Ch":0},{"Timestamp":893,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1222,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1413,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1596,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1782,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2125,"Mod":0,"Key":256,"Ch":101},{"Timestamp":2980,"Mod":0,"Key":257,"Ch":0},{"Timestamp":3429,"Mod":0,"Key":256,"Ch":115},{"Timestamp":3782,"Mod":0,"Key":257,"Ch":0},{"Timestamp":4022,"Mod":0,"Key":256,"Ch":101},{"Timestamp":4286,"Mod":0,"Key":257,"Ch":0},{"Timestamp":4550,"Mod":0,"Key":256,"Ch":102},{"Timestamp":4814,"Mod":0,"Key":257,"Ch":0},{"Timestamp":5014,"Mod":0,"Key":256,"Ch":100},{"Timestamp":5750,"Mod":0,"Key":256,"Ch":109},{"Timestamp":6221,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7254,"Mod":0,"Key":256,"Ch":109},{"Timestamp":7733,"Mod":0,"Key":13,"Ch":13},{"Timestamp":8556,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/rebase3/setup.sh b/test/integration/rebase3/setup.sh deleted file mode 100644 index 99c030a87..000000000 --- a/test/integration/rebase3/setup.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -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-added - -echo test4 > file4 -git add . -git commit -am file4-changed - -echo test5 > file4 -git add . -git commit -am file4-changed-again diff --git a/test/integration/rebase3/test.json b/test/integration/rebase3/test.json deleted file mode 100644 index fe5eca258..000000000 --- a/test/integration/rebase3/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "More interactive rebasing, with drop/fix/squash and edit commands", "speed": 10 } diff --git a/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 82d191bdf..000000000 --- a/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1,24 +0,0 @@ -# This is a combination of 2 commits. -# This is the 1st commit message: - -file4-changed - -# This is the commit message #2: - -file4-changed-again - -# Please enter the commit message for your changes. Lines starting -# with '#' will be ignored, and an empty message aborts the commit. -# -# Date: Tue Apr 6 11:47:48 2021 +1000 -# -# interactive rebase in progress; onto 12ed10a -# Last commands done (2 commands done): -# pick 1d197a4 file4-changed -# squash 4dc7f31 file4-changed-again -# No commands remaining. -# You are currently rebasing branch 'master' on '12ed10a'. -# -# Changes to be committed: -# modified: file4 -# diff --git a/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/FETCH_HEAD b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/HEAD b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/ORIG_HEAD b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 0931f5d6f..000000000 --- a/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -7b01314ccdeccc57cee454feca6369237410e786 diff --git a/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/config b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/rebaseFixupAndSquash/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/rebaseFixupAndSquash/expected/repo/.git_keep/description b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/rebaseFixupAndSquash/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/rebaseFixupAndSquash/expected/repo/.git_keep/index b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/index deleted file mode 100644 index 8788e55ee..000000000 Binary files a/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/info/exclude b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/rebaseFixupAndSquash/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/rebaseFixupAndSquash/expected/repo/.git_keep/logs/HEAD b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index e0596fd20..000000000 --- a/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,14 +0,0 @@ -0000000000000000000000000000000000000000 0d633de5bd380e6b42e03ec1e7a055ba4f3c860d CI 1617673668 +1000 commit (initial): file0 -0d633de5bd380e6b42e03ec1e7a055ba4f3c860d 7b01314ccdeccc57cee454feca6369237410e786 CI 1617673668 +1000 commit: file1 -7b01314ccdeccc57cee454feca6369237410e786 74d431c56eac1e359f6f5736978347af68af5702 CI 1617673668 +1000 commit: file2 -74d431c56eac1e359f6f5736978347af68af5702 12ed10a6439eadfdb8877e39b7c6547591a0a91c CI 1617673668 +1000 commit: file4-added -12ed10a6439eadfdb8877e39b7c6547591a0a91c 1d197a4c509a5e71bad9b0b439c8fd26323ff218 CI 1617673668 +1000 commit: file4-changed -1d197a4c509a5e71bad9b0b439c8fd26323ff218 4dc7f318f68fe1890dba6fb595009c4652c0a861 CI 1617673668 +1000 commit: file4-changed-again -4dc7f318f68fe1890dba6fb595009c4652c0a861 1d197a4c509a5e71bad9b0b439c8fd26323ff218 CI 1617673669 +1000 rebase -i (start): checkout 12ed10a6439eadfdb8877e39b7c6547591a0a91c -1d197a4c509a5e71bad9b0b439c8fd26323ff218 7679fc004a4a40da12907d72ccef14991976aaff CI 1617673669 +1000 rebase -i (squash): file4-changed -7679fc004a4a40da12907d72ccef14991976aaff 7679fc004a4a40da12907d72ccef14991976aaff CI 1617673669 +1000 rebase -i (finish): returning to refs/heads/master -7679fc004a4a40da12907d72ccef14991976aaff 7b01314ccdeccc57cee454feca6369237410e786 CI 1617673671 +1000 rebase -i (start): checkout 0d633de5bd380e6b42e03ec1e7a055ba4f3c860d -7b01314ccdeccc57cee454feca6369237410e786 dbab7e62cd7517f73425d46120a931a59c8eda6e CI 1617673671 +1000 rebase -i (fixup): file1 -dbab7e62cd7517f73425d46120a931a59c8eda6e 4ae4346ad59bf70d5ba07184af5a138b6a65c224 CI 1617673671 +1000 rebase -i (pick): file4-added -4ae4346ad59bf70d5ba07184af5a138b6a65c224 8adb7457de59c3945566ce7675a31bbf048b38ee CI 1617673671 +1000 rebase -i (pick): file4-changed -8adb7457de59c3945566ce7675a31bbf048b38ee 8adb7457de59c3945566ce7675a31bbf048b38ee CI 1617673671 +1000 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 787b78287..000000000 --- a/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,8 +0,0 @@ -0000000000000000000000000000000000000000 0d633de5bd380e6b42e03ec1e7a055ba4f3c860d CI 1617673668 +1000 commit (initial): file0 -0d633de5bd380e6b42e03ec1e7a055ba4f3c860d 7b01314ccdeccc57cee454feca6369237410e786 CI 1617673668 +1000 commit: file1 -7b01314ccdeccc57cee454feca6369237410e786 74d431c56eac1e359f6f5736978347af68af5702 CI 1617673668 +1000 commit: file2 -74d431c56eac1e359f6f5736978347af68af5702 12ed10a6439eadfdb8877e39b7c6547591a0a91c CI 1617673668 +1000 commit: file4-added -12ed10a6439eadfdb8877e39b7c6547591a0a91c 1d197a4c509a5e71bad9b0b439c8fd26323ff218 CI 1617673668 +1000 commit: file4-changed -1d197a4c509a5e71bad9b0b439c8fd26323ff218 4dc7f318f68fe1890dba6fb595009c4652c0a861 CI 1617673668 +1000 commit: file4-changed-again -4dc7f318f68fe1890dba6fb595009c4652c0a861 7679fc004a4a40da12907d72ccef14991976aaff CI 1617673669 +1000 rebase -i (finish): refs/heads/master onto 12ed10a6439eadfdb8877e39b7c6547591a0a91c -7679fc004a4a40da12907d72ccef14991976aaff 8adb7457de59c3945566ce7675a31bbf048b38ee CI 1617673671 +1000 rebase -i (finish): refs/heads/master onto 0d633de5bd380e6b42e03ec1e7a055ba4f3c860d diff --git a/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/0d/633de5bd380e6b42e03ec1e7a055ba4f3c860d b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/0d/633de5bd380e6b42e03ec1e7a055ba4f3c860d deleted file mode 100644 index b3ad40df8..000000000 Binary files a/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/0d/633de5bd380e6b42e03ec1e7a055ba4f3c860d and /dev/null differ diff --git a/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/12/ed10a6439eadfdb8877e39b7c6547591a0a91c b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/12/ed10a6439eadfdb8877e39b7c6547591a0a91c deleted file mode 100644 index 5c061b73e..000000000 Binary files a/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/12/ed10a6439eadfdb8877e39b7c6547591a0a91c and /dev/null differ diff --git a/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/1d/197a4c509a5e71bad9b0b439c8fd26323ff218 b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/1d/197a4c509a5e71bad9b0b439c8fd26323ff218 deleted file mode 100644 index 67d18fdba..000000000 Binary files a/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/1d/197a4c509a5e71bad9b0b439c8fd26323ff218 and /dev/null differ diff --git a/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67..000000000 Binary files a/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 and /dev/null differ diff --git a/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d..000000000 Binary files a/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da and /dev/null differ diff --git a/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 deleted file mode 100644 index 39b5247e9..000000000 Binary files a/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 and /dev/null differ diff --git a/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/4a/e4346ad59bf70d5ba07184af5a138b6a65c224 b/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/4a/e4346ad59bf70d5ba07184af5a138b6a65c224 deleted file mode 100644 index 8e2bc272c..000000000 --- a/test/integration/rebaseFixupAndSquash/expected/repo/.git_keep/objects/4a/e4346ad59bf70d5ba07184af5a138b6a65c224 +++ /dev/null @@ -1,3 +0,0 @@ -x}α -0a 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-added - -echo test4 > file4 -git add . -git commit -am file4-changed - -echo test5 > file4 -git add . -git commit -am file4-changed-again diff --git a/test/integration/rebaseFixupAndSquash/test.json b/test/integration/rebaseFixupAndSquash/test.json deleted file mode 100644 index 62c84c89a..000000000 --- a/test/integration/rebaseFixupAndSquash/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "Directly invoking a fixup and a squash", "speed": 10 } diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/rebaseFixups/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 7c10b820b..000000000 --- a/test/integration/rebaseFixups/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -fixup! file4-added diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/FETCH_HEAD b/test/integration/rebaseFixups/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/HEAD b/test/integration/rebaseFixups/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/rebaseFixups/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/ORIG_HEAD b/test/integration/rebaseFixups/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index b2314b936..000000000 --- a/test/integration/rebaseFixups/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -ace527b9737b6c554963361f50ce98a0509c2344 diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/config b/test/integration/rebaseFixups/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/rebaseFixups/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/rebaseFixups/expected/repo/.git_keep/description b/test/integration/rebaseFixups/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/rebaseFixups/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/rebaseFixups/expected/repo/.git_keep/index b/test/integration/rebaseFixups/expected/repo/.git_keep/index deleted file mode 100644 index b0c222619..000000000 Binary files a/test/integration/rebaseFixups/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/info/exclude b/test/integration/rebaseFixups/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/rebaseFixups/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/rebaseFixups/expected/repo/.git_keep/logs/HEAD b/test/integration/rebaseFixups/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 939752164..000000000 --- a/test/integration/rebaseFixups/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,14 +0,0 @@ -0000000000000000000000000000000000000000 b8c4d6287efcb68cdffbac00ec15ffc25f575cc5 CI 1617673872 +1000 commit (initial): file0 -b8c4d6287efcb68cdffbac00ec15ffc25f575cc5 69ebe8bf01f728a9bc787e8553694e36127b48c0 CI 1617673872 +1000 commit: file1 -69ebe8bf01f728a9bc787e8553694e36127b48c0 1d7ab21ab5322589052cf9d2d62ca58677f454cc CI 1617673872 +1000 commit: file2 -1d7ab21ab5322589052cf9d2d62ca58677f454cc 331be377b5889b19b5900bc4bed98b1c9cc40095 CI 1617673872 +1000 commit: file4-added -331be377b5889b19b5900bc4bed98b1c9cc40095 ace527b9737b6c554963361f50ce98a0509c2344 CI 1617673872 +1000 commit: file4-changed -ace527b9737b6c554963361f50ce98a0509c2344 77741cf500de50347e9f4e5a091515e4568ddad3 CI 1617673872 +1000 commit: file4-changed-again -77741cf500de50347e9f4e5a091515e4568ddad3 dcbade3308277dabb66de476c1cce03bd840d22a CI 1617673875 +1000 commit: fixup! file4-changed -dcbade3308277dabb66de476c1cce03bd840d22a 1056fd624d61daad06a8726c0ea5626820cafe59 CI 1617673877 +1000 commit: fixup! file4-added -1056fd624d61daad06a8726c0ea5626820cafe59 331be377b5889b19b5900bc4bed98b1c9cc40095 CI 1617673879 +1000 rebase -i (start): checkout 69ebe8bf01f728a9bc787e8553694e36127b48c0^ -331be377b5889b19b5900bc4bed98b1c9cc40095 30a685cfa43930aadd5b56b2ec0746564d1a1d22 CI 1617673879 +1000 rebase -i (fixup): file4-added -30a685cfa43930aadd5b56b2ec0746564d1a1d22 2bd4d58d29b60b5868c19437ff4467d84ed270aa CI 1617673879 +1000 rebase -i (pick): file4-changed -2bd4d58d29b60b5868c19437ff4467d84ed270aa 4d7b35df7f8ced30495fc0f62b91a270bad7076b CI 1617673879 +1000 rebase -i (fixup): file4-changed -4d7b35df7f8ced30495fc0f62b91a270bad7076b c8738908c85292494dba61be9c050ad95ff0e182 CI 1617673879 +1000 rebase -i (pick): file4-changed-again -c8738908c85292494dba61be9c050ad95ff0e182 c8738908c85292494dba61be9c050ad95ff0e182 CI 1617673879 +1000 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/rebaseFixups/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 43ff8c639..000000000 --- a/test/integration/rebaseFixups/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,9 +0,0 @@ -0000000000000000000000000000000000000000 b8c4d6287efcb68cdffbac00ec15ffc25f575cc5 CI 1617673872 +1000 commit (initial): file0 -b8c4d6287efcb68cdffbac00ec15ffc25f575cc5 69ebe8bf01f728a9bc787e8553694e36127b48c0 CI 1617673872 +1000 commit: file1 -69ebe8bf01f728a9bc787e8553694e36127b48c0 1d7ab21ab5322589052cf9d2d62ca58677f454cc CI 1617673872 +1000 commit: file2 -1d7ab21ab5322589052cf9d2d62ca58677f454cc 331be377b5889b19b5900bc4bed98b1c9cc40095 CI 1617673872 +1000 commit: file4-added -331be377b5889b19b5900bc4bed98b1c9cc40095 ace527b9737b6c554963361f50ce98a0509c2344 CI 1617673872 +1000 commit: file4-changed -ace527b9737b6c554963361f50ce98a0509c2344 77741cf500de50347e9f4e5a091515e4568ddad3 CI 1617673872 +1000 commit: file4-changed-again -77741cf500de50347e9f4e5a091515e4568ddad3 dcbade3308277dabb66de476c1cce03bd840d22a CI 1617673875 +1000 commit: fixup! file4-changed -dcbade3308277dabb66de476c1cce03bd840d22a 1056fd624d61daad06a8726c0ea5626820cafe59 CI 1617673877 +1000 commit: fixup! file4-added -1056fd624d61daad06a8726c0ea5626820cafe59 c8738908c85292494dba61be9c050ad95ff0e182 CI 1617673879 +1000 rebase -i (finish): refs/heads/master onto b8c4d6287efcb68cdffbac00ec15ffc25f575cc5 diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/10/56fd624d61daad06a8726c0ea5626820cafe59 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/10/56fd624d61daad06a8726c0ea5626820cafe59 deleted file mode 100644 index 83047c02c..000000000 --- a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/10/56fd624d61daad06a8726c0ea5626820cafe59 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Ѯs麴LD(cL2#LK)Sn k| Q"'"RVF ʛ~+HN,=FG$R lsVIbg٠o=>R^`@>"99UOn+Ӭ͝ET޺> \ No newline at end of file diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/1d/7ab21ab5322589052cf9d2d62ca58677f454cc b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/1d/7ab21ab5322589052cf9d2d62ca58677f454cc deleted file mode 100644 index 6fa0dda1b..000000000 --- a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/1d/7ab21ab5322589052cf9d2d62ca58677f454cc +++ /dev/null @@ -1,3 +0,0 @@ -xK -0@]d2i31`Dn[kKU*K"T -ŚjѲʢV\ʔ}wAJh+Đ2 aP-q$fOS`g'LphNzNuS7uY9 \ No newline at end of file diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67..000000000 Binary files a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 and /dev/null differ diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/2a/627747a92ce8c274f7df0da3329616f69b9856 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/2a/627747a92ce8c274f7df0da3329616f69b9856 deleted file mode 100644 index f4470cb27..000000000 Binary files a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/2a/627747a92ce8c274f7df0da3329616f69b9856 and /dev/null differ diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/2b/d4d58d29b60b5868c19437ff4467d84ed270aa b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/2b/d4d58d29b60b5868c19437ff4467d84ed270aa deleted file mode 100644 index 79d872ca6..000000000 Binary files a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/2b/d4d58d29b60b5868c19437ff4467d84ed270aa and /dev/null differ diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/30/a685cfa43930aadd5b56b2ec0746564d1a1d22 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/30/a685cfa43930aadd5b56b2ec0746564d1a1d22 deleted file mode 100644 index e59fd9ab6..000000000 Binary files a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/30/a685cfa43930aadd5b56b2ec0746564d1a1d22 and /dev/null differ diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/33/1be377b5889b19b5900bc4bed98b1c9cc40095 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/33/1be377b5889b19b5900bc4bed98b1c9cc40095 deleted file mode 100644 index fcbf9a75b..000000000 Binary files a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/33/1be377b5889b19b5900bc4bed98b1c9cc40095 and /dev/null differ diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d..000000000 Binary files a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da and /dev/null differ diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 deleted file mode 100644 index 39b5247e9..000000000 Binary files a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 and /dev/null differ diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/4d/7b35df7f8ced30495fc0f62b91a270bad7076b b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/4d/7b35df7f8ced30495fc0f62b91a270bad7076b deleted file mode 100644 index fab1d7995..000000000 Binary files a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/4d/7b35df7f8ced30495fc0f62b91a270bad7076b and /dev/null differ diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f deleted file mode 100644 index 953241815..000000000 Binary files a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f and /dev/null differ diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/69/ebe8bf01f728a9bc787e8553694e36127b48c0 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/69/ebe8bf01f728a9bc787e8553694e36127b48c0 deleted file mode 100644 index 5b85e230c..000000000 Binary files a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/69/ebe8bf01f728a9bc787e8553694e36127b48c0 and /dev/null differ diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/77/741cf500de50347e9f4e5a091515e4568ddad3 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/77/741cf500de50347e9f4e5a091515e4568ddad3 deleted file mode 100644 index 459addc0f..000000000 Binary files a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/77/741cf500de50347e9f4e5a091515e4568ddad3 and /dev/null differ diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/83/90c32b5e687b97e242da46498b574ace0e1eb5 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/83/90c32b5e687b97e242da46498b574ace0e1eb5 deleted file mode 100644 index be495f399..000000000 Binary files a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/83/90c32b5e687b97e242da46498b574ace0e1eb5 and /dev/null differ diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06d..000000000 Binary files a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c and /dev/null differ diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/ac/e527b9737b6c554963361f50ce98a0509c2344 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/ac/e527b9737b6c554963361f50ce98a0509c2344 deleted file mode 100644 index 4ac2c9b90..000000000 Binary files a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/ac/e527b9737b6c554963361f50ce98a0509c2344 and /dev/null differ diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/ad/46c1683d660e21b4f13ad808420a4de18326b7 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/ad/46c1683d660e21b4f13ad808420a4de18326b7 deleted file mode 100644 index 10809ddfb..000000000 --- a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/ad/46c1683d660e21b4f13ad808420a4de18326b7 +++ /dev/null @@ -1,2 +0,0 @@ -x+)JMU043e040031QHI5`ֶww.hT[H - yW5Ɨ(| ^-W1H0jPwEU-[#)0adrA?ce_{u3kYh!ր.7I \ No newline at end of file diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/b8/c4d6287efcb68cdffbac00ec15ffc25f575cc5 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/b8/c4d6287efcb68cdffbac00ec15ffc25f575cc5 deleted file mode 100644 index 393911960..000000000 Binary files a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/b8/c4d6287efcb68cdffbac00ec15ffc25f575cc5 and /dev/null differ diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/ba/860ef885ce294ade006af8afda01a8cc584a12 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/ba/860ef885ce294ade006af8afda01a8cc584a12 deleted file mode 100644 index 71d98204d..000000000 --- a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/ba/860ef885ce294ade006af8afda01a8cc584a12 +++ /dev/null @@ -1,2 +0,0 @@ -x+)JMU0`040031QHI5`ֶww.hT[H - yW5Ɨ(| ^-W1H0jPwEU-[#)0adrA?ce_{uS 2?ruOn+3kYh!ր.7CV7 \ No newline at end of file diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/c8/07dfd74adc1e1b732025cab46cf56b4d193e74 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/c8/07dfd74adc1e1b732025cab46cf56b4d193e74 deleted file mode 100644 index 06a7c3149..000000000 Binary files a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/c8/07dfd74adc1e1b732025cab46cf56b4d193e74 and /dev/null differ diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/c8/738908c85292494dba61be9c050ad95ff0e182 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/c8/738908c85292494dba61be9c050ad95ff0e182 deleted file mode 100644 index 96f65d24b..000000000 Binary files a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/c8/738908c85292494dba61be9c050ad95ff0e182 and /dev/null differ diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 deleted file mode 100644 index f390e4e4d..000000000 Binary files a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 and /dev/null differ diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/rebaseFixups/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/rebaseFixups/expected/repo/.git_keep/objects/d1/3e563982268d8ab77ad47793a2b501dfe6a0dc b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/d1/3e563982268d8ab77ad47793a2b501dfe6a0dc deleted file mode 100644 index f7f6b9e60..000000000 Binary files a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/d1/3e563982268d8ab77ad47793a2b501dfe6a0dc and /dev/null differ diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/dc/bade3308277dabb66de476c1cce03bd840d22a b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/dc/bade3308277dabb66de476c1cce03bd840d22a deleted file mode 100644 index 74b7026b4..000000000 Binary files a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/dc/bade3308277dabb66de476c1cce03bd840d22a and /dev/null differ diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/e3/ad04c1fd3c9137b052ecb422855052f044d88f b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/e3/ad04c1fd3c9137b052ecb422855052f044d88f deleted file mode 100644 index 371c28d79..000000000 Binary files a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/e3/ad04c1fd3c9137b052ecb422855052f044d88f and /dev/null differ diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 b/test/integration/rebaseFixups/expected/repo/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 deleted file mode 100644 index f082bca50..000000000 Binary files a/test/integration/rebaseFixups/expected/repo/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 and /dev/null differ diff --git a/test/integration/rebaseFixups/expected/repo/.git_keep/refs/heads/master b/test/integration/rebaseFixups/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 883b23a0e..000000000 --- a/test/integration/rebaseFixups/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -c8738908c85292494dba61be9c050ad95ff0e182 diff --git a/test/integration/rebaseFixups/expected/repo/file0 b/test/integration/rebaseFixups/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/rebaseFixups/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/rebaseFixups/expected/repo/file1 b/test/integration/rebaseFixups/expected/repo/file1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/rebaseFixups/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/rebaseFixups/expected/repo/file2 b/test/integration/rebaseFixups/expected/repo/file2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/rebaseFixups/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/rebaseFixups/expected/repo/file4 b/test/integration/rebaseFixups/expected/repo/file4 deleted file mode 100644 index 4f346f1ad..000000000 --- a/test/integration/rebaseFixups/expected/repo/file4 +++ /dev/null @@ -1 +0,0 @@ -test5 diff --git a/test/integration/rebaseFixups/expected/repo/file5 b/test/integration/rebaseFixups/expected/repo/file5 deleted file mode 100644 index 8390c32b5..000000000 --- a/test/integration/rebaseFixups/expected/repo/file5 +++ /dev/null @@ -1 +0,0 @@ -test6 diff --git a/test/integration/rebaseFixups/expected/repo/file6 b/test/integration/rebaseFixups/expected/repo/file6 deleted file mode 100644 index e3ad04c1f..000000000 --- a/test/integration/rebaseFixups/expected/repo/file6 +++ /dev/null @@ -1 +0,0 @@ -test7 diff --git a/test/integration/rebaseFixups/recording.json b/test/integration/rebaseFixups/recording.json deleted file mode 100644 index 7e9e1aace..000000000 --- a/test/integration/rebaseFixups/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":1148,"Mod":0,"Key":256,"Ch":32},{"Timestamp":1469,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1716,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2133,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2860,"Mod":0,"Key":256,"Ch":70},{"Timestamp":3205,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3645,"Mod":0,"Key":260,"Ch":0},{"Timestamp":3797,"Mod":0,"Key":260,"Ch":0},{"Timestamp":4053,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4316,"Mod":0,"Key":259,"Ch":0},{"Timestamp":4469,"Mod":0,"Key":259,"Ch":0},{"Timestamp":4765,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4901,"Mod":0,"Key":258,"Ch":0},{"Timestamp":5164,"Mod":0,"Key":256,"Ch":70},{"Timestamp":5468,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5868,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6061,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6349,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6644,"Mod":0,"Key":256,"Ch":83},{"Timestamp":7108,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7924,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/rebaseFixups/setup.sh b/test/integration/rebaseFixups/setup.sh deleted file mode 100644 index 99fec6578..000000000 --- a/test/integration/rebaseFixups/setup.sh +++ /dev/null @@ -1,37 +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-added - -echo test4 > file4 -git add . -git commit -am file4-changed - -echo test5 > file4 -git add . -git commit -am file4-changed-again - -echo test6 > file5 -echo test7 > file6 diff --git a/test/integration/rebaseFixups/test.json b/test/integration/rebaseFixups/test.json deleted file mode 100644 index bf4a43f42..000000000 --- a/test/integration/rebaseFixups/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "Squashing all above fixup commits", "speed": 10 } diff --git a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 3a4521c05..000000000 --- a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -file2lol diff --git a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/FETCH_HEAD b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/HEAD b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/config b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/rebaseRewordLastCommit/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/rebaseRewordLastCommit/expected/repo/.git_keep/description b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/rebaseRewordLastCommit/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/rebaseRewordLastCommit/expected/repo/.git_keep/index b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/index deleted file mode 100644 index 8481c3b75..000000000 Binary files a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/info/exclude b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/rebaseRewordLastCommit/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/rebaseRewordLastCommit/expected/repo/.git_keep/logs/HEAD b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 3646fdd64..000000000 --- a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 e298537fd470f70bbb174d78f610fe49539cfe66 CI 1617696002 +1000 commit (initial): file0 -e298537fd470f70bbb174d78f610fe49539cfe66 97066d3866b8e5ead0b68fc746a02222408f28a3 CI 1617696002 +1000 commit: file1 -97066d3866b8e5ead0b68fc746a02222408f28a3 74abc9e0d0ec8dd0f5ea872a851364206008ea2b CI 1617696002 +1000 commit: file2 -74abc9e0d0ec8dd0f5ea872a851364206008ea2b 59f4e88de812c15bf0fa7b224cdb361f7ede8931 CI 1617696010 +1000 commit (amend): file2lol diff --git a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 3646fdd64..000000000 --- a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 e298537fd470f70bbb174d78f610fe49539cfe66 CI 1617696002 +1000 commit (initial): file0 -e298537fd470f70bbb174d78f610fe49539cfe66 97066d3866b8e5ead0b68fc746a02222408f28a3 CI 1617696002 +1000 commit: file1 -97066d3866b8e5ead0b68fc746a02222408f28a3 74abc9e0d0ec8dd0f5ea872a851364206008ea2b CI 1617696002 +1000 commit: file2 -74abc9e0d0ec8dd0f5ea872a851364206008ea2b 59f4e88de812c15bf0fa7b224cdb361f7ede8931 CI 1617696010 +1000 commit (amend): file2lol diff --git a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67..000000000 Binary files a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 and /dev/null differ diff --git a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d..000000000 Binary files a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da and /dev/null differ diff --git a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/59/f4e88de812c15bf0fa7b224cdb361f7ede8931 b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/59/f4e88de812c15bf0fa7b224cdb361f7ede8931 deleted file mode 100644 index 4cba53db2..000000000 Binary files a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/59/f4e88de812c15bf0fa7b224cdb361f7ede8931 and /dev/null differ diff --git a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/74/abc9e0d0ec8dd0f5ea872a851364206008ea2b b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/74/abc9e0d0ec8dd0f5ea872a851364206008ea2b deleted file mode 100644 index 6b21dff7e..000000000 Binary files a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/74/abc9e0d0ec8dd0f5ea872a851364206008ea2b and /dev/null differ diff --git a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/97/066d3866b8e5ead0b68fc746a02222408f28a3 b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/97/066d3866b8e5ead0b68fc746a02222408f28a3 deleted file mode 100644 index e2ccd0b98..000000000 Binary files a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/97/066d3866b8e5ead0b68fc746a02222408f28a3 and /dev/null differ diff --git a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06d..000000000 Binary files a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c and /dev/null differ diff --git a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/rebaseRewordLastCommit/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/rebaseRewordLastCommit/expected/repo/.git_keep/objects/d4/83ea1d742e44d9191f3e31e926d7621c513042 b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/d4/83ea1d742e44d9191f3e31e926d7621c513042 deleted file mode 100644 index b0cd18a51..000000000 Binary files a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/d4/83ea1d742e44d9191f3e31e926d7621c513042 and /dev/null differ diff --git a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/e2/98537fd470f70bbb174d78f610fe49539cfe66 b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/e2/98537fd470f70bbb174d78f610fe49539cfe66 deleted file mode 100644 index f07b23840..000000000 --- a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/objects/e2/98537fd470f70bbb174d78f610fe49539cfe66 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0Fa9c U4R"x|{޴6wS\b6C*=Wsޠ]0c_-Lk{0;1:/`څ+ \ No newline at end of file diff --git a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/refs/heads/master b/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index ada8401bb..000000000 --- a/test/integration/rebaseRewordLastCommit/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -59f4e88de812c15bf0fa7b224cdb361f7ede8931 diff --git a/test/integration/rebaseRewordLastCommit/expected/repo/file0 b/test/integration/rebaseRewordLastCommit/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/rebaseRewordLastCommit/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/rebaseRewordLastCommit/expected/repo/file1 b/test/integration/rebaseRewordLastCommit/expected/repo/file1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/rebaseRewordLastCommit/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/rebaseRewordLastCommit/expected/repo/file2 b/test/integration/rebaseRewordLastCommit/expected/repo/file2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/rebaseRewordLastCommit/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/rebaseRewordLastCommit/expected/repo/file3 b/test/integration/rebaseRewordLastCommit/expected/repo/file3 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/rebaseRewordLastCommit/expected/repo/file3 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/rebaseRewordLastCommit/recording.json b/test/integration/rebaseRewordLastCommit/recording.json deleted file mode 100644 index 4ffb9bd50..000000000 --- a/test/integration/rebaseRewordLastCommit/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":1593,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1889,"Mod":0,"Key":259,"Ch":0},{"Timestamp":2896,"Mod":0,"Key":256,"Ch":114},{"Timestamp":4200,"Mod":0,"Key":256,"Ch":108},{"Timestamp":5153,"Mod":0,"Key":256,"Ch":111},{"Timestamp":5609,"Mod":0,"Key":256,"Ch":108},{"Timestamp":8609,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9520,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/rebaseRewordLastCommit/setup.sh b/test/integration/rebaseRewordLastCommit/setup.sh deleted file mode 100644 index cdd7ac5d0..000000000 --- a/test/integration/rebaseRewordLastCommit/setup.sh +++ /dev/null @@ -1,25 +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 > file3 -git add . diff --git a/test/integration/rebaseRewordLastCommit/test.json b/test/integration/rebaseRewordLastCommit/test.json deleted file mode 100644 index a1391f372..000000000 --- a/test/integration/rebaseRewordLastCommit/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "Rewording top commit", "speed": 20 } diff --git a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 996bc28b7..000000000 --- a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -file1 2 diff --git a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/FETCH_HEAD b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/HEAD b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/ORIG_HEAD b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 62f236fad..000000000 --- a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -3c3125afd7a6475dcdd4c4a6b20cc920b31eb96f diff --git a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/config b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/rebaseRewordOldCommit/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/rebaseRewordOldCommit/expected/repo/.git_keep/description b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/rebaseRewordOldCommit/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/rebaseRewordOldCommit/expected/repo/.git_keep/index b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/index deleted file mode 100644 index c1bf8572e..000000000 Binary files a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/info/exclude b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/rebaseRewordOldCommit/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/rebaseRewordOldCommit/expected/repo/.git_keep/logs/HEAD b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 2fd699dc0..000000000 --- a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,9 +0,0 @@ -0000000000000000000000000000000000000000 4479c0a1c7e43a55a3a6909be88a810dbad3fc42 CI 1641696830 +1100 commit (initial): file0 -4479c0a1c7e43a55a3a6909be88a810dbad3fc42 3c3125afd7a6475dcdd4c4a6b20cc920b31eb96f CI 1641696830 +1100 commit: file1 -3c3125afd7a6475dcdd4c4a6b20cc920b31eb96f 7c5b8c907caad01842aa84e91b7d4724d57de4fd CI 1641696830 +1100 commit: file2 -7c5b8c907caad01842aa84e91b7d4724d57de4fd 7c5b8c907caad01842aa84e91b7d4724d57de4fd CI 1641696835 +1100 rebase: updating HEAD -7c5b8c907caad01842aa84e91b7d4724d57de4fd 4479c0a1c7e43a55a3a6909be88a810dbad3fc42 CI 1641696835 +1100 rebase -i (start): checkout 4479c0a1c7e43a55a3a6909be88a810dbad3fc42 -4479c0a1c7e43a55a3a6909be88a810dbad3fc42 3c3125afd7a6475dcdd4c4a6b20cc920b31eb96f CI 1641696835 +1100 rebase -i: fast-forward -3c3125afd7a6475dcdd4c4a6b20cc920b31eb96f 1bcb7e30b3a5a5ae64397dcfe6b74cc18fc55784 CI 1641696835 +1100 commit (amend): file1 2 -1bcb7e30b3a5a5ae64397dcfe6b74cc18fc55784 9d793e4fc04a0583eed7670d52fbb16b402f7499 CI 1641696835 +1100 rebase -i (pick): file2 -9d793e4fc04a0583eed7670d52fbb16b402f7499 9d793e4fc04a0583eed7670d52fbb16b402f7499 CI 1641696835 +1100 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index e62904977..000000000 --- a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,4 +0,0 @@ -0000000000000000000000000000000000000000 4479c0a1c7e43a55a3a6909be88a810dbad3fc42 CI 1641696830 +1100 commit (initial): file0 -4479c0a1c7e43a55a3a6909be88a810dbad3fc42 3c3125afd7a6475dcdd4c4a6b20cc920b31eb96f CI 1641696830 +1100 commit: file1 -3c3125afd7a6475dcdd4c4a6b20cc920b31eb96f 7c5b8c907caad01842aa84e91b7d4724d57de4fd CI 1641696830 +1100 commit: file2 -7c5b8c907caad01842aa84e91b7d4724d57de4fd 9d793e4fc04a0583eed7670d52fbb16b402f7499 CI 1641696835 +1100 rebase -i (finish): refs/heads/master onto 4479c0a1c7e43a55a3a6909be88a810dbad3fc42 diff --git a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/1b/cb7e30b3a5a5ae64397dcfe6b74cc18fc55784 b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/1b/cb7e30b3a5a5ae64397dcfe6b74cc18fc55784 deleted file mode 100644 index 189a77100..000000000 Binary files a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/1b/cb7e30b3a5a5ae64397dcfe6b74cc18fc55784 and /dev/null differ diff --git a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67..000000000 Binary files a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 and /dev/null differ diff --git a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d..000000000 Binary files a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da and /dev/null differ diff --git a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/3c/3125afd7a6475dcdd4c4a6b20cc920b31eb96f b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/3c/3125afd7a6475dcdd4c4a6b20cc920b31eb96f deleted file mode 100644 index 91e0c959b..000000000 Binary files a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/3c/3125afd7a6475dcdd4c4a6b20cc920b31eb96f and /dev/null differ diff --git a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/44/79c0a1c7e43a55a3a6909be88a810dbad3fc42 b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/44/79c0a1c7e43a55a3a6909be88a810dbad3fc42 deleted file mode 100644 index a62257409..000000000 Binary files a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/44/79c0a1c7e43a55a3a6909be88a810dbad3fc42 and /dev/null differ diff --git a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/64/7b9df53752363ecdc1d4c5cebe7d66e6132bfe b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/64/7b9df53752363ecdc1d4c5cebe7d66e6132bfe deleted file mode 100644 index 1a7ba1071..000000000 --- a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/64/7b9df53752363ecdc1d4c5cebe7d66e6132bfe +++ /dev/null @@ -1,4 +0,0 @@ -xAj1 e˶J dUΠd3aƁ>_Åc5sA C -ZVC֒H1LO^1\4T_Y=fB0PSQæ^|qF - -#e:xl`׸-;_r_;ҿd\3>u&y76xGL} \ No newline at end of file diff --git a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/7c/5b8c907caad01842aa84e91b7d4724d57de4fd b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/7c/5b8c907caad01842aa84e91b7d4724d57de4fd deleted file mode 100644 index c7c3a4183..000000000 Binary files a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/7c/5b8c907caad01842aa84e91b7d4724d57de4fd and /dev/null differ diff --git a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/9d/793e4fc04a0583eed7670d52fbb16b402f7499 b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/9d/793e4fc04a0583eed7670d52fbb16b402f7499 deleted file mode 100644 index a7b197eb9..000000000 Binary files a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/9d/793e4fc04a0583eed7670d52fbb16b402f7499 and /dev/null differ diff --git a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06d..000000000 Binary files a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c and /dev/null differ diff --git a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/c0/793b482cdf9ca48686dbf56fc0a46e982003e1 b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/c0/793b482cdf9ca48686dbf56fc0a46e982003e1 deleted file mode 100644 index da9c5bc32..000000000 Binary files a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/c0/793b482cdf9ca48686dbf56fc0a46e982003e1 and /dev/null differ diff --git a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/rebaseRewordOldCommit/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/rebaseRewordOldCommit/expected/repo/.git_keep/objects/d4/83ea1d742e44d9191f3e31e926d7621c513042 b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/d4/83ea1d742e44d9191f3e31e926d7621c513042 deleted file mode 100644 index b0cd18a51..000000000 Binary files a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/d4/83ea1d742e44d9191f3e31e926d7621c513042 and /dev/null differ diff --git a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/refs/heads/master b/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index d952177d9..000000000 --- a/test/integration/rebaseRewordOldCommit/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -9d793e4fc04a0583eed7670d52fbb16b402f7499 diff --git a/test/integration/rebaseRewordOldCommit/expected/repo/file0 b/test/integration/rebaseRewordOldCommit/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/rebaseRewordOldCommit/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/rebaseRewordOldCommit/expected/repo/file1 b/test/integration/rebaseRewordOldCommit/expected/repo/file1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/rebaseRewordOldCommit/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/rebaseRewordOldCommit/expected/repo/file2 b/test/integration/rebaseRewordOldCommit/expected/repo/file2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/rebaseRewordOldCommit/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/rebaseRewordOldCommit/expected/repo/file3 b/test/integration/rebaseRewordOldCommit/expected/repo/file3 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/rebaseRewordOldCommit/expected/repo/file3 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/rebaseRewordOldCommit/recording.json b/test/integration/rebaseRewordOldCommit/recording.json deleted file mode 100644 index 0d27c4c7f..000000000 --- a/test/integration/rebaseRewordOldCommit/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":1013,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1332,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1811,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2643,"Mod":0,"Key":256,"Ch":114},{"Timestamp":3269,"Mod":0,"Key":256,"Ch":32},{"Timestamp":3795,"Mod":0,"Key":256,"Ch":50},{"Timestamp":4420,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5859,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/rebaseRewordOldCommit/setup.sh b/test/integration/rebaseRewordOldCommit/setup.sh deleted file mode 100644 index cdd7ac5d0..000000000 --- a/test/integration/rebaseRewordOldCommit/setup.sh +++ /dev/null @@ -1,25 +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 > file3 -git add . diff --git a/test/integration/rebaseRewordOldCommit/test.json b/test/integration/rebaseRewordOldCommit/test.json deleted file mode 100644 index b75601d7e..000000000 --- a/test/integration/rebaseRewordOldCommit/test.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "description": "Rewording old commit", - "speed": 20 -} diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/rebaseSwapping/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index a154d4e80..000000000 --- a/test/integration/rebaseSwapping/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1,15 +0,0 @@ -file4-changed - -# Please enter the commit message for your changes. Lines starting -# with '#' will be ignored, and an empty message aborts the commit. -# -# interactive rebase in progress; onto 613c1bf -# Last commands done (2 commands done): -# pick 0e45fe2 file4-changed-again -# pick ceada38 file4-changed -# No commands remaining. -# You are currently rebasing branch 'master' on '613c1bf'. -# -# Changes to be committed: -# modified: file4 -# diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/FETCH_HEAD b/test/integration/rebaseSwapping/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/HEAD b/test/integration/rebaseSwapping/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/rebaseSwapping/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/ORIG_HEAD b/test/integration/rebaseSwapping/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 7b6e3c529..000000000 --- a/test/integration/rebaseSwapping/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -ceada384bff8df54abb8acbf497b751aa9220f00 diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/REBASE_HEAD b/test/integration/rebaseSwapping/expected/repo/.git_keep/REBASE_HEAD deleted file mode 100644 index 7b6e3c529..000000000 --- a/test/integration/rebaseSwapping/expected/repo/.git_keep/REBASE_HEAD +++ /dev/null @@ -1 +0,0 @@ -ceada384bff8df54abb8acbf497b751aa9220f00 diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/config b/test/integration/rebaseSwapping/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/rebaseSwapping/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/rebaseSwapping/expected/repo/.git_keep/description b/test/integration/rebaseSwapping/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/rebaseSwapping/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/rebaseSwapping/expected/repo/.git_keep/index b/test/integration/rebaseSwapping/expected/repo/.git_keep/index deleted file mode 100644 index 927d6bdde..000000000 Binary files a/test/integration/rebaseSwapping/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/info/exclude b/test/integration/rebaseSwapping/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/rebaseSwapping/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/rebaseSwapping/expected/repo/.git_keep/logs/HEAD b/test/integration/rebaseSwapping/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 688468fbd..000000000 --- a/test/integration/rebaseSwapping/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,10 +0,0 @@ -0000000000000000000000000000000000000000 ac32b36c1b300cc79ad3f16dfb3c8a77ea7f4965 CI 1617673516 +1000 commit (initial): file0 -ac32b36c1b300cc79ad3f16dfb3c8a77ea7f4965 b218d34eec545f29156411f24ab609b970082e1c CI 1617673516 +1000 commit: file1 -b218d34eec545f29156411f24ab609b970082e1c d23bcf26566cbf601e766d12ea206cb7827d6630 CI 1617673516 +1000 commit: file2 -d23bcf26566cbf601e766d12ea206cb7827d6630 613c1bfa180babe5e67317d1ef42d566718a7d8f CI 1617673516 +1000 commit: file4-added -613c1bfa180babe5e67317d1ef42d566718a7d8f ceada384bff8df54abb8acbf497b751aa9220f00 CI 1617673516 +1000 commit: file4-changed -ceada384bff8df54abb8acbf497b751aa9220f00 0e45fe2fb8b21adfe348ec5419bd87e4c796c02a CI 1617673516 +1000 commit: file4-changed-again -0e45fe2fb8b21adfe348ec5419bd87e4c796c02a 613c1bfa180babe5e67317d1ef42d566718a7d8f CI 1617673517 +1000 rebase -i (start): checkout 613c1bfa180babe5e67317d1ef42d566718a7d8f -613c1bfa180babe5e67317d1ef42d566718a7d8f 84c7a918e6bd704aaf4f789ecaea479ab31d4741 CI 1617673520 +1000 rebase -i (continue): file4-changed-again -84c7a918e6bd704aaf4f789ecaea479ab31d4741 41eefd8a741d391640c4e0528e0b6fff31f90a18 CI 1617673523 +1000 rebase -i (continue): file4-changed -41eefd8a741d391640c4e0528e0b6fff31f90a18 41eefd8a741d391640c4e0528e0b6fff31f90a18 CI 1617673523 +1000 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/rebaseSwapping/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 0f69be051..000000000 --- a/test/integration/rebaseSwapping/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 ac32b36c1b300cc79ad3f16dfb3c8a77ea7f4965 CI 1617673516 +1000 commit (initial): file0 -ac32b36c1b300cc79ad3f16dfb3c8a77ea7f4965 b218d34eec545f29156411f24ab609b970082e1c CI 1617673516 +1000 commit: file1 -b218d34eec545f29156411f24ab609b970082e1c d23bcf26566cbf601e766d12ea206cb7827d6630 CI 1617673516 +1000 commit: file2 -d23bcf26566cbf601e766d12ea206cb7827d6630 613c1bfa180babe5e67317d1ef42d566718a7d8f CI 1617673516 +1000 commit: file4-added -613c1bfa180babe5e67317d1ef42d566718a7d8f ceada384bff8df54abb8acbf497b751aa9220f00 CI 1617673516 +1000 commit: file4-changed -ceada384bff8df54abb8acbf497b751aa9220f00 0e45fe2fb8b21adfe348ec5419bd87e4c796c02a CI 1617673516 +1000 commit: file4-changed-again -0e45fe2fb8b21adfe348ec5419bd87e4c796c02a 41eefd8a741d391640c4e0528e0b6fff31f90a18 CI 1617673523 +1000 rebase -i (finish): refs/heads/master onto 613c1bfa180babe5e67317d1ef42d566718a7d8f diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/0e/45fe2fb8b21adfe348ec5419bd87e4c796c02a b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/0e/45fe2fb8b21adfe348ec5419bd87e4c796c02a deleted file mode 100644 index 4f88bafe1..000000000 --- a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/0e/45fe2fb8b21adfe348ec5419bd87e4c796c02a +++ /dev/null @@ -1,2 +0,0 @@ -xM -0@s%+1IfT0*B_[׺4H2N^䬹#P6e0:9%G@Zxd&,hM̱RĜ!֊i~aa|#%C8W/+.ϸMT:p@{ \ No newline at end of file diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 deleted file mode 100644 index 79fcadf67..000000000 Binary files a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/1e/3e67b999db1576ad1ee08bf4f02bdf29e49442 and /dev/null differ diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da deleted file mode 100644 index 06c9cb73d..000000000 Binary files a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/38/143ad4a0fe2ab6ee53c2ef89a5d9e2bd9535da and /dev/null differ diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/41/eefd8a741d391640c4e0528e0b6fff31f90a18 b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/41/eefd8a741d391640c4e0528e0b6fff31f90a18 deleted file mode 100644 index 5aece5fd7..000000000 Binary files a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/41/eefd8a741d391640c4e0528e0b6fff31f90a18 and /dev/null differ diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 deleted file mode 100644 index 39b5247e9..000000000 Binary files a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/44/e5064a45438ffa3e6e4a0f1444552e2199be97 and /dev/null differ diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f deleted file mode 100644 index 953241815..000000000 Binary files a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f and /dev/null differ diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/5e/6e75233f7d0501f030400c0b55d4c778b72b73 b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/5e/6e75233f7d0501f030400c0b55d4c778b72b73 deleted file mode 100644 index 4e81f29f6..000000000 Binary files a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/5e/6e75233f7d0501f030400c0b55d4c778b72b73 and /dev/null differ diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/61/3c1bfa180babe5e67317d1ef42d566718a7d8f b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/61/3c1bfa180babe5e67317d1ef42d566718a7d8f deleted file mode 100644 index 3710de84b..000000000 Binary files a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/61/3c1bfa180babe5e67317d1ef42d566718a7d8f and /dev/null differ diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/84/c7a918e6bd704aaf4f789ecaea479ab31d4741 b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/84/c7a918e6bd704aaf4f789ecaea479ab31d4741 deleted file mode 100644 index 947ad09af..000000000 Binary files a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/84/c7a918e6bd704aaf4f789ecaea479ab31d4741 and /dev/null differ diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c deleted file mode 100644 index 0e95eb06d..000000000 Binary files a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/9e/88a70dc8d82dd2afbfd50176ef78e18823bc2c and /dev/null differ diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/ac/32b36c1b300cc79ad3f16dfb3c8a77ea7f4965 b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/ac/32b36c1b300cc79ad3f16dfb3c8a77ea7f4965 deleted file mode 100644 index ea84eed18..000000000 Binary files a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/ac/32b36c1b300cc79ad3f16dfb3c8a77ea7f4965 and /dev/null differ diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/b2/18d34eec545f29156411f24ab609b970082e1c b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/b2/18d34eec545f29156411f24ab609b970082e1c deleted file mode 100644 index 16467f7b3..000000000 --- a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/b2/18d34eec545f29156411f24ab609b970082e1c +++ /dev/null @@ -1,4 +0,0 @@ -xA -0@Q9Ed:c2`R"x|{ti8̗TC -RʒZ Sn݋␑2I -VR3UMDOf}m/G ;1O2p?:B \ No newline at end of file diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 deleted file mode 100644 index f390e4e4d..000000000 Binary files a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/cc/01bf15804065932f5e50340902614b3c04c948 and /dev/null differ diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/ce/ada384bff8df54abb8acbf497b751aa9220f00 b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/ce/ada384bff8df54abb8acbf497b751aa9220f00 deleted file mode 100644 index 03ea663e8..000000000 Binary files a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/ce/ada384bff8df54abb8acbf497b751aa9220f00 and /dev/null differ diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/d0/76cc9cc09acaa2d36fbc7a95fd3e2306494641 deleted file mode 100644 index 2e9066287..000000000 --- a/test/integration/rebaseSwapping/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/rebaseSwapping/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/d2/3bcf26566cbf601e766d12ea206cb7827d6630 b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/d2/3bcf26566cbf601e766d12ea206cb7827d6630 deleted file mode 100644 index 9029233a3..000000000 Binary files a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/d2/3bcf26566cbf601e766d12ea206cb7827d6630 and /dev/null differ diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 deleted file mode 100644 index f082bca50..000000000 Binary files a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/ff/3fb62dafc2fdd0c81ed64bc132b53584e5e1e2 and /dev/null differ diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/ff/8d9889fccee3b361f37c46c9f0de3f5ef6d70f b/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/ff/8d9889fccee3b361f37c46c9f0de3f5ef6d70f deleted file mode 100644 index 36cb3da9a..000000000 Binary files a/test/integration/rebaseSwapping/expected/repo/.git_keep/objects/ff/8d9889fccee3b361f37c46c9f0de3f5ef6d70f and /dev/null differ diff --git a/test/integration/rebaseSwapping/expected/repo/.git_keep/refs/heads/master b/test/integration/rebaseSwapping/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index b99ec7548..000000000 --- a/test/integration/rebaseSwapping/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -41eefd8a741d391640c4e0528e0b6fff31f90a18 diff --git a/test/integration/rebaseSwapping/expected/repo/file0 b/test/integration/rebaseSwapping/expected/repo/file0 deleted file mode 100644 index 38143ad4a..000000000 --- a/test/integration/rebaseSwapping/expected/repo/file0 +++ /dev/null @@ -1 +0,0 @@ -test0 diff --git a/test/integration/rebaseSwapping/expected/repo/file1 b/test/integration/rebaseSwapping/expected/repo/file1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/rebaseSwapping/expected/repo/file1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/rebaseSwapping/expected/repo/file2 b/test/integration/rebaseSwapping/expected/repo/file2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/rebaseSwapping/expected/repo/file2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/rebaseSwapping/expected/repo/file4 b/test/integration/rebaseSwapping/expected/repo/file4 deleted file mode 100644 index d234c5e05..000000000 --- a/test/integration/rebaseSwapping/expected/repo/file4 +++ /dev/null @@ -1 +0,0 @@ -test4 diff --git a/test/integration/rebaseSwapping/recording.json b/test/integration/rebaseSwapping/recording.json deleted file mode 100644 index 87bbffe60..000000000 --- a/test/integration/rebaseSwapping/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":759,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1102,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1711,"Mod":2,"Key":10,"Ch":10},{"Timestamp":2455,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2943,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3335,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3838,"Mod":0,"Key":256,"Ch":32},{"Timestamp":4390,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5110,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5695,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6207,"Mod":0,"Key":256,"Ch":32},{"Timestamp":6742,"Mod":0,"Key":13,"Ch":13},{"Timestamp":7695,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/rebaseSwapping/setup.sh b/test/integration/rebaseSwapping/setup.sh deleted file mode 100644 index 99c030a87..000000000 --- a/test/integration/rebaseSwapping/setup.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -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-added - -echo test4 > file4 -git add . -git commit -am file4-changed - -echo test5 > file4 -git add . -git commit -am file4-changed-again diff --git a/test/integration/rebaseSwapping/test.json b/test/integration/rebaseSwapping/test.json deleted file mode 100644 index 102681523..000000000 --- a/test/integration/rebaseSwapping/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "Directly swapping two commits, then resolving the conflicts", "speed": 10 } diff --git a/test/integration/squash/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/squash/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 3d0b7b54d..000000000 --- a/test/integration/squash/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1,30 +0,0 @@ -# This is a combination of 3 commits. -# This is the 1st commit message: - -myfile2 - -# This is the commit message #2: - -myfile3 - -# The commit message #3 will be skipped: - -# myfile5 - -# Please enter the commit message for your changes. Lines starting -# with '#' will be ignored, and an empty message aborts the commit. -# -# Date: Tue Apr 6 11:12:11 2021 +1000 -# -# interactive rebase in progress; onto a59b3d4 -# Last commands done (4 commands done): -# drop 88fb48b myfile4 -# fixup a1cf779 myfile5 -# No commands remaining. -# You are currently rebasing branch 'master' on 'a59b3d4'. -# -# Changes to be committed: -# new file: myfile2 -# new file: myfile3 -# new file: myfile5 -# diff --git a/test/integration/squash/expected/repo/.git_keep/FETCH_HEAD b/test/integration/squash/expected/repo/.git_keep/FETCH_HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/squash/expected/repo/.git_keep/HEAD b/test/integration/squash/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/squash/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/squash/expected/repo/.git_keep/ORIG_HEAD b/test/integration/squash/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 2b380f442..000000000 --- a/test/integration/squash/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -3c752371dc0c58af7ff63f7a6c252da9f4d96251 diff --git a/test/integration/squash/expected/repo/.git_keep/config b/test/integration/squash/expected/repo/.git_keep/config deleted file mode 100644 index 8ae104545..000000000 --- a/test/integration/squash/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/squash/expected/repo/.git_keep/description b/test/integration/squash/expected/repo/.git_keep/description deleted file mode 100644 index 498b267a8..000000000 --- a/test/integration/squash/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/squash/expected/repo/.git_keep/index b/test/integration/squash/expected/repo/.git_keep/index deleted file mode 100644 index 755c639e2..000000000 Binary files a/test/integration/squash/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/squash/expected/repo/.git_keep/info/exclude b/test/integration/squash/expected/repo/.git_keep/info/exclude deleted file mode 100644 index 8e9f2071f..000000000 --- a/test/integration/squash/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/squash/expected/repo/.git_keep/logs/HEAD b/test/integration/squash/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 295964da2..000000000 --- a/test/integration/squash/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,10 +0,0 @@ -0000000000000000000000000000000000000000 a59b3d4800dcbf39ab31887402dc178e7b7f82a5 CI 1617671531 +1000 commit (initial): myfile1 -a59b3d4800dcbf39ab31887402dc178e7b7f82a5 3c752371dc0c58af7ff63f7a6c252da9f4d96251 CI 1617671531 +1000 commit: myfile2 -3c752371dc0c58af7ff63f7a6c252da9f4d96251 9f83377e9068d956fe3085934bb32ce22aeb4bf7 CI 1617671531 +1000 commit: myfile3 -9f83377e9068d956fe3085934bb32ce22aeb4bf7 88fb48b35f6ece4da3ad62dd3426bca0240d63a5 CI 1617671531 +1000 commit: myfile4 -88fb48b35f6ece4da3ad62dd3426bca0240d63a5 a1cf7798606057d592f8ef1bee884165b6f629f1 CI 1617671531 +1000 commit: myfile5 -a1cf7798606057d592f8ef1bee884165b6f629f1 a59b3d4800dcbf39ab31887402dc178e7b7f82a5 CI 1617671533 +1000 rebase -i (start): checkout a59b3d4800dcbf39ab31887402dc178e7b7f82a5 -a59b3d4800dcbf39ab31887402dc178e7b7f82a5 3c752371dc0c58af7ff63f7a6c252da9f4d96251 CI 1617671533 +1000 rebase -i: fast-forward -3c752371dc0c58af7ff63f7a6c252da9f4d96251 c59791a0d43d3e0a7ed0a40a62b7929acf675bf0 CI 1617671536 +1000 rebase -i (squash): # This is a combination of 2 commits. -c59791a0d43d3e0a7ed0a40a62b7929acf675bf0 075bd21694c75fd12e11cbd487eb64d831362e8c CI 1617671536 +1000 rebase -i (fixup): myfile2 -075bd21694c75fd12e11cbd487eb64d831362e8c 075bd21694c75fd12e11cbd487eb64d831362e8c CI 1617671536 +1000 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/squash/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/squash/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index e7e0b635b..000000000 --- a/test/integration/squash/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,6 +0,0 @@ -0000000000000000000000000000000000000000 a59b3d4800dcbf39ab31887402dc178e7b7f82a5 CI 1617671531 +1000 commit (initial): myfile1 -a59b3d4800dcbf39ab31887402dc178e7b7f82a5 3c752371dc0c58af7ff63f7a6c252da9f4d96251 CI 1617671531 +1000 commit: myfile2 -3c752371dc0c58af7ff63f7a6c252da9f4d96251 9f83377e9068d956fe3085934bb32ce22aeb4bf7 CI 1617671531 +1000 commit: myfile3 -9f83377e9068d956fe3085934bb32ce22aeb4bf7 88fb48b35f6ece4da3ad62dd3426bca0240d63a5 CI 1617671531 +1000 commit: myfile4 -88fb48b35f6ece4da3ad62dd3426bca0240d63a5 a1cf7798606057d592f8ef1bee884165b6f629f1 CI 1617671531 +1000 commit: myfile5 -a1cf7798606057d592f8ef1bee884165b6f629f1 075bd21694c75fd12e11cbd487eb64d831362e8c CI 1617671536 +1000 rebase -i (finish): refs/heads/master onto a59b3d4800dcbf39ab31887402dc178e7b7f82a5 diff --git a/test/integration/squash/expected/repo/.git_keep/objects/07/5bd21694c75fd12e11cbd487eb64d831362e8c b/test/integration/squash/expected/repo/.git_keep/objects/07/5bd21694c75fd12e11cbd487eb64d831362e8c deleted file mode 100644 index 646d1891c..000000000 Binary files a/test/integration/squash/expected/repo/.git_keep/objects/07/5bd21694c75fd12e11cbd487eb64d831362e8c and /dev/null differ diff --git a/test/integration/squash/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 b/test/integration/squash/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 deleted file mode 100644 index 7f2ebf4ee..000000000 Binary files a/test/integration/squash/expected/repo/.git_keep/objects/0e/6cf0a6b79e8d44e186d812a1f74b43d64fac52 and /dev/null differ diff --git a/test/integration/squash/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/squash/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/squash/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/squash/expected/repo/.git_keep/objects/1b/838df93e188ddacfce91d03dfcf1386ca57714 b/test/integration/squash/expected/repo/.git_keep/objects/1b/838df93e188ddacfce91d03dfcf1386ca57714 deleted file mode 100644 index 45934b124..000000000 Binary files a/test/integration/squash/expected/repo/.git_keep/objects/1b/838df93e188ddacfce91d03dfcf1386ca57714 and /dev/null differ diff --git a/test/integration/squash/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce b/test/integration/squash/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce deleted file mode 100644 index 0a734f981..000000000 Binary files a/test/integration/squash/expected/repo/.git_keep/objects/2b/173c861df433fa43ffad13f80c8b312c5c8bce and /dev/null differ diff --git a/test/integration/squash/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 b/test/integration/squash/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 deleted file mode 100644 index 31ae3f5ba..000000000 Binary files a/test/integration/squash/expected/repo/.git_keep/objects/2f/6174050380438f14b16658a356e762435ca591 and /dev/null differ diff --git a/test/integration/squash/expected/repo/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be b/test/integration/squash/expected/repo/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be deleted file mode 100644 index aca754d63..000000000 Binary files a/test/integration/squash/expected/repo/.git_keep/objects/30/a1ca3481fdec3245b02aeacfb72ddfe2a433be and /dev/null differ diff --git a/test/integration/squash/expected/repo/.git_keep/objects/3c/752371dc0c58af7ff63f7a6c252da9f4d96251 b/test/integration/squash/expected/repo/.git_keep/objects/3c/752371dc0c58af7ff63f7a6c252da9f4d96251 deleted file mode 100644 index 72c11da74..000000000 Binary files a/test/integration/squash/expected/repo/.git_keep/objects/3c/752371dc0c58af7ff63f7a6c252da9f4d96251 and /dev/null differ diff --git a/test/integration/squash/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f b/test/integration/squash/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f deleted file mode 100644 index 953241815..000000000 Binary files a/test/integration/squash/expected/repo/.git_keep/objects/4f/346f1ad5ba2917da2109e2eaa2f2dfbb86f10f and /dev/null differ diff --git a/test/integration/squash/expected/repo/.git_keep/objects/88/fb48b35f6ece4da3ad62dd3426bca0240d63a5 b/test/integration/squash/expected/repo/.git_keep/objects/88/fb48b35f6ece4da3ad62dd3426bca0240d63a5 deleted file mode 100644 index 697df3951..000000000 Binary files a/test/integration/squash/expected/repo/.git_keep/objects/88/fb48b35f6ece4da3ad62dd3426bca0240d63a5 and /dev/null differ diff --git a/test/integration/squash/expected/repo/.git_keep/objects/9f/83377e9068d956fe3085934bb32ce22aeb4bf7 b/test/integration/squash/expected/repo/.git_keep/objects/9f/83377e9068d956fe3085934bb32ce22aeb4bf7 deleted file mode 100644 index 07a311e40..000000000 --- a/test/integration/squash/expected/repo/.git_keep/objects/9f/83377e9068d956fe3085934bb32ce22aeb4bf7 +++ /dev/null @@ -1,3 +0,0 @@ -xK -0@] W1,[J=xt C8]2rIP5 *T -q<ǃ,f]^"1CeDZfՄ)ҠG0udt)^B2D{91ܴ.OA*7: \ No newline at end of file diff --git a/test/integration/squash/expected/repo/.git_keep/objects/a1/cf7798606057d592f8ef1bee884165b6f629f1 b/test/integration/squash/expected/repo/.git_keep/objects/a1/cf7798606057d592f8ef1bee884165b6f629f1 deleted file mode 100644 index cb0e899e7..000000000 --- a/test/integration/squash/expected/repo/.git_keep/objects/a1/cf7798606057d592f8ef1bee884165b6f629f1 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@Q9d&icLR"~絵^wU +8b-ɱO։JipTuDI&:XDEHJ8 )ulK F0Np~m^0'3ZkQrӾu^ԛv; \ No newline at end of file diff --git a/test/integration/squash/expected/repo/.git_keep/objects/a5/9b3d4800dcbf39ab31887402dc178e7b7f82a5 b/test/integration/squash/expected/repo/.git_keep/objects/a5/9b3d4800dcbf39ab31887402dc178e7b7f82a5 deleted file mode 100644 index 5bd43ffee..000000000 --- a/test/integration/squash/expected/repo/.git_keep/objects/a5/9b3d4800dcbf39ab31887402dc178e7b7f82a5 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0@ѮsʌJ\yL")#tyS5[˥*`5df 9Px^%s^ui4=xz+!;9i'w+0, \ No newline at end of file diff --git a/test/integration/squash/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/squash/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/squash/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/squash/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 b/test/integration/squash/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 deleted file mode 100644 index 96d2e71a6..000000000 Binary files a/test/integration/squash/expected/repo/.git_keep/objects/a7/341a59f0ddeef969e69fb6368266d22b0f2416 and /dev/null differ diff --git a/test/integration/squash/expected/repo/.git_keep/objects/c5/9791a0d43d3e0a7ed0a40a62b7929acf675bf0 b/test/integration/squash/expected/repo/.git_keep/objects/c5/9791a0d43d3e0a7ed0a40a62b7929acf675bf0 deleted file mode 100644 index 138c93f07..000000000 --- a/test/integration/squash/expected/repo/.git_keep/objects/c5/9791a0d43d3e0a7ed0a40a62b7929acf675bf0 +++ /dev/null @@ -1 +0,0 @@ -xJ1 `}ifED}MvTз*E/? ܀PߵUGKM@x8"%&QW^eiS1D9;hZ' _\W8t~7.׋C-HV}ڟjn\yb>/r]&06 n+(m"G{1v3?i;`E \ No newline at end of file diff --git a/test/integration/squash/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 b/test/integration/squash/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 deleted file mode 100644 index d39fa7d2f..000000000 Binary files a/test/integration/squash/expected/repo/.git_keep/objects/d2/34c5e057fe32c676ea67e8cb38f4625ddaeb54 and /dev/null differ diff --git a/test/integration/squash/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/squash/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/squash/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/squash/expected/repo/.git_keep/refs/heads/master b/test/integration/squash/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index e0bf38bb0..000000000 --- a/test/integration/squash/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -075bd21694c75fd12e11cbd487eb64d831362e8c diff --git a/test/integration/squash/expected/repo/myfile1 b/test/integration/squash/expected/repo/myfile1 deleted file mode 100644 index a5bce3fd2..000000000 --- a/test/integration/squash/expected/repo/myfile1 +++ /dev/null @@ -1 +0,0 @@ -test1 diff --git a/test/integration/squash/expected/repo/myfile2 b/test/integration/squash/expected/repo/myfile2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/squash/expected/repo/myfile2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/squash/expected/repo/myfile3 b/test/integration/squash/expected/repo/myfile3 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/squash/expected/repo/myfile3 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/squash/expected/repo/myfile5 b/test/integration/squash/expected/repo/myfile5 deleted file mode 100644 index 4f346f1ad..000000000 --- a/test/integration/squash/expected/repo/myfile5 +++ /dev/null @@ -1 +0,0 @@ -test5 diff --git a/test/integration/squash/recording.json b/test/integration/squash/recording.json deleted file mode 100644 index d431b9bcc..000000000 --- a/test/integration/squash/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":568,"Mod":0,"Key":259,"Ch":0},{"Timestamp":784,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1056,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1217,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1369,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1592,"Mod":0,"Key":256,"Ch":101},{"Timestamp":2377,"Mod":0,"Key":257,"Ch":0},{"Timestamp":2728,"Mod":0,"Key":256,"Ch":115},{"Timestamp":2905,"Mod":0,"Key":257,"Ch":0},{"Timestamp":3128,"Mod":0,"Key":256,"Ch":100},{"Timestamp":3320,"Mod":0,"Key":257,"Ch":0},{"Timestamp":3552,"Mod":0,"Key":256,"Ch":102},{"Timestamp":4192,"Mod":0,"Key":256,"Ch":109},{"Timestamp":4528,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5320,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":127,"Height":35}]} \ No newline at end of file diff --git a/test/integration/squash/setup.sh b/test/integration/squash/setup.sh deleted file mode 100644 index 44b82bf26..000000000 --- a/test/integration/squash/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 test1 > myfile1 -git add . -git commit -am "myfile1" -echo test2 > myfile2 -git add . -git commit -am "myfile2" -echo test3 > myfile3 -git add . -git commit -am "myfile3" -echo test4 > myfile4 -git add . -git commit -am "myfile4" -echo test5 > myfile5 -git add . -git commit -am "myfile5" diff --git a/test/integration/squash/test.json b/test/integration/squash/test.json deleted file mode 100644 index 41e095612..000000000 --- a/test/integration/squash/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "" }