diff --git a/pkg/gui/modes.go b/pkg/gui/modes.go index 3a3bc51a6..70d403db2 100644 --- a/pkg/gui/modes.go +++ b/pkg/gui/modes.go @@ -53,10 +53,17 @@ func (gui *Gui) modeStatuses() []modeStatus { { isActive: gui.State.Modes.CherryPicking.Active, description: func() string { + copiedCount := len(gui.State.Modes.CherryPicking.CherryPickedCommits) + text := gui.c.Tr.LcCommitsCopied + if copiedCount == 1 { + text = gui.c.Tr.LcCommitCopied + } + return gui.withResetButton( fmt.Sprintf( - "%d commits copied", - len(gui.State.Modes.CherryPicking.CherryPickedCommits), + "%d %s", + copiedCount, + text, ), style.FgCyan, ) diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 608ad2f45..08f737a51 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -507,6 +507,8 @@ type TranslationSet struct { EmptyOutput string Patch string CustomPatch string + LcCommitsCopied string + LcCommitCopied string Actions Actions Bisect Bisect } @@ -1147,6 +1149,8 @@ func EnglishTranslationSet() TranslationSet { EmptyOutput: "", Patch: "Patch", CustomPatch: "Custom patch", + LcCommitsCopied: "commits copied", + LcCommitCopied: "commit copied", Actions: Actions{ // TODO: combine this with the original keybinding descriptions (those are all in lowercase atm) CheckoutCommit: "Checkout commit", diff --git a/pkg/integration/components/assert.go b/pkg/integration/components/assert.go index 28be134a6..daa376c66 100644 --- a/pkg/integration/components/assert.go +++ b/pkg/integration/components/assert.go @@ -217,7 +217,7 @@ func (self *Assert) matchString(matcher *matcher, context string, getValue func( } func (self *Assert) assertWithRetries(test func() (bool, string)) { - waitTimes := []int{0, 1, 5, 10, 200, 500, 1000, 2000} + waitTimes := []int{0, 1, 5, 10, 200, 500, 1000, 2000, 4000} var message string for _, waitTime := range waitTimes { diff --git a/pkg/integration/components/input.go b/pkg/integration/components/input.go index 45ffdfc5d..61c78e9eb 100644 --- a/pkg/integration/components/input.go +++ b/pkg/integration/components/input.go @@ -76,6 +76,11 @@ func (self *Input) Confirm() { self.pressKey(self.keys.Universal.Confirm) } +// i.e. same as Confirm +func (self *Input) Enter() { + self.pressKey(self.keys.Universal.Confirm) +} + // i.e. pressing escape func (self *Input) Cancel() { self.pressKey(self.keys.Universal.Return) diff --git a/pkg/integration/tests/branch/rebase.go b/pkg/integration/tests/branch/rebase.go index 8b414b794..efaa07c88 100644 --- a/pkg/integration/tests/branch/rebase.go +++ b/pkg/integration/tests/branch/rebase.go @@ -3,59 +3,16 @@ package branch import ( "github.com/jesseduffield/lazygit/pkg/config" . "github.com/jesseduffield/lazygit/pkg/integration/components" + "github.com/jesseduffield/lazygit/pkg/integration/tests/shared" ) -var originalFileContent = ` -This -Is -The -Original -File -` - -var firstChangeFileContent = ` -This -Is -The -First Change -File -` - -var secondChangeFileContent = ` -This -Is -The -Second Change -File -` - -// prepares us for a rebase that has conflicts -var commonRebaseSetup = func(shell *Shell) { - shell. - NewBranch("original-branch"). - EmptyCommit("one"). - EmptyCommit("two"). - EmptyCommit("three"). - CreateFileAndAdd("file", originalFileContent). - Commit("original"). - NewBranch("first-change-branch"). - UpdateFileAndAdd("file", firstChangeFileContent). - Commit("first change"). - Checkout("original-branch"). - NewBranch("second-change-branch"). - UpdateFileAndAdd("file", secondChangeFileContent). - Commit("second change"). - EmptyCommit("second-change-branch unrelated change"). - Checkout("first-change-branch") -} - var Rebase = NewIntegrationTest(NewIntegrationTestArgs{ Description: "Rebase onto another branch, deal with the conflicts.", ExtraCmdArgs: "", Skip: false, SetupConfig: func(config *config.AppConfig) {}, SetupRepo: func(shell *Shell) { - commonRebaseSetup(shell) + shared.MergeConflictsSetup(shell) }, Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) { input.SwitchToBranchesWindow() diff --git a/pkg/integration/tests/branch/rebase_and_drop.go b/pkg/integration/tests/branch/rebase_and_drop.go index d87919a0a..853ed692d 100644 --- a/pkg/integration/tests/branch/rebase_and_drop.go +++ b/pkg/integration/tests/branch/rebase_and_drop.go @@ -3,6 +3,7 @@ package branch import ( "github.com/jesseduffield/lazygit/pkg/config" . "github.com/jesseduffield/lazygit/pkg/integration/components" + "github.com/jesseduffield/lazygit/pkg/integration/tests/shared" ) var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{ @@ -11,7 +12,7 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{ Skip: false, SetupConfig: func(config *config.AppConfig) {}, SetupRepo: func(shell *Shell) { - commonRebaseSetup(shell) + shared.MergeConflictsSetup(shell) // addin a couple additional commits so that we can drop one shell.EmptyCommit("to remove") shell.EmptyCommit("to keep") diff --git a/pkg/integration/tests/cherry_pick/cherry_pick.go b/pkg/integration/tests/cherry_pick/cherry_pick.go new file mode 100644 index 000000000..0f5715434 --- /dev/null +++ b/pkg/integration/tests/cherry_pick/cherry_pick.go @@ -0,0 +1,66 @@ +package cherry_pick + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var CherryPick = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Cherry pick commits from the subcommits view, without conflicts", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell. + EmptyCommit("base"). + NewBranch("first-branch"). + NewBranch("second-branch"). + Checkout("first-branch"). + EmptyCommit("one"). + EmptyCommit("two"). + Checkout("second-branch"). + EmptyCommit("three"). + EmptyCommit("four"). + Checkout("first-branch") + }, + Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) { + input.SwitchToBranchesWindow() + assert.CurrentViewName("localBranches") + + assert.MatchSelectedLine(Contains("first-branch")) + input.NextItem() + assert.MatchSelectedLine(Contains("second-branch")) + + input.Enter() + + assert.CurrentViewName("subCommits") + assert.MatchSelectedLine(Contains("four")) + input.PressKeys(keys.Commits.CherryPickCopy) + assert.MatchViewContent("information", Contains("1 commit copied")) + + input.NextItem() + assert.MatchSelectedLine(Contains("three")) + input.PressKeys(keys.Commits.CherryPickCopy) + assert.MatchViewContent("information", Contains("2 commits copied")) + + input.SwitchToCommitsWindow() + assert.CurrentViewName("commits") + + assert.MatchSelectedLine(Contains("two")) + input.PressKeys(keys.Commits.PasteCommits) + assert.InAlert() + assert.MatchCurrentViewContent(Contains("Are you sure you want to cherry-pick the copied commits onto this branch?")) + + input.Confirm() + assert.CurrentViewName("commits") + assert.MatchSelectedLine(Contains("four")) + input.NextItem() + assert.MatchSelectedLine(Contains("three")) + input.NextItem() + assert.MatchSelectedLine(Contains("two")) + + assert.MatchViewContent("information", Contains("2 commits copied")) + input.PressKeys(keys.Universal.Return) + assert.MatchViewContent("information", NotContains("commits copied")) + }, +}) diff --git a/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go new file mode 100644 index 000000000..e747d8e4d --- /dev/null +++ b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go @@ -0,0 +1,87 @@ +package cherry_pick + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" + "github.com/jesseduffield/lazygit/pkg/integration/tests/shared" +) + +var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Cherry pick commits from the subcommits view, with conflicts", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shared.MergeConflictsSetup(shell) + }, + Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) { + input.SwitchToBranchesWindow() + assert.CurrentViewName("localBranches") + + assert.MatchSelectedLine(Contains("first-change-branch")) + input.NextItem() + assert.MatchSelectedLine(Contains("second-change-branch")) + + input.Enter() + + assert.CurrentViewName("subCommits") + assert.MatchSelectedLine(Contains("second-change-branch unrelated change")) + input.PressKeys(keys.Commits.CherryPickCopy) + assert.MatchViewContent("information", Contains("1 commit copied")) + + input.NextItem() + assert.MatchSelectedLine(Contains("second change")) + input.PressKeys(keys.Commits.CherryPickCopy) + assert.MatchViewContent("information", Contains("2 commits copied")) + + input.SwitchToCommitsWindow() + assert.CurrentViewName("commits") + + assert.MatchSelectedLine(Contains("first change")) + input.PressKeys(keys.Commits.PasteCommits) + assert.InAlert() + assert.MatchCurrentViewContent(Contains("Are you sure you want to cherry-pick the copied commits onto this branch?")) + + input.Confirm() + + assert.MatchCurrentViewContent(Contains("Conflicts!")) + input.Confirm() + + assert.CurrentViewName("files") + assert.MatchSelectedLine(Contains("file")) + + // not using Confirm() convenience method because I suspect we might change this + // keybinding to something more bespoke + input.PressKeys(keys.Universal.Confirm) + + assert.CurrentViewName("mergeConflicts") + // picking 'Second change' + input.NextItem() + input.PrimaryAction() + + assert.InConfirm() + assert.MatchCurrentViewContent(Contains("all merge conflicts resolved. Continue?")) + input.Confirm() + + assert.CurrentViewName("files") + assert.WorkingTreeFileCount(0) + + input.SwitchToCommitsWindow() + assert.CurrentViewName("commits") + + assert.MatchSelectedLine(Contains("second-change-branch unrelated change")) + input.NextItem() + assert.MatchSelectedLine(Contains("second change")) + // because we picked 'Second change' when resolving the conflict, + // we now see this commit as having replaced First Change with Second Change, + // as opposed to replacing 'Original' with 'Second change' + assert.MatchMainViewContent(Contains("-First Change")) + assert.MatchMainViewContent(Contains("+Second Change")) + input.NextItem() + assert.MatchSelectedLine(Contains("first change")) + + assert.MatchViewContent("information", Contains("2 commits copied")) + input.PressKeys(keys.Universal.Return) + assert.MatchViewContent("information", NotContains("commits copied")) + }, +}) diff --git a/pkg/integration/tests/shared/README.md b/pkg/integration/tests/shared/README.md new file mode 100644 index 000000000..2dc27a428 --- /dev/null +++ b/pkg/integration/tests/shared/README.md @@ -0,0 +1 @@ +This package contains shared helper functions for tests. It is not intended to contain any actual tests itself. diff --git a/pkg/integration/tests/shared/conflicts.go b/pkg/integration/tests/shared/conflicts.go new file mode 100644 index 000000000..f01125c91 --- /dev/null +++ b/pkg/integration/tests/shared/conflicts.go @@ -0,0 +1,49 @@ +package shared + +import ( + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var OriginalFileContent = ` +This +Is +The +Original +File +` + +var FirstChangeFileContent = ` +This +Is +The +First Change +File +` + +var SecondChangeFileContent = ` +This +Is +The +Second Change +File +` + +// prepares us for a rebase/merge that has conflicts +var MergeConflictsSetup = func(shell *Shell) { + shell. + NewBranch("original-branch"). + EmptyCommit("one"). + EmptyCommit("two"). + EmptyCommit("three"). + CreateFileAndAdd("file", OriginalFileContent). + Commit("original"). + NewBranch("first-change-branch"). + UpdateFileAndAdd("file", FirstChangeFileContent). + Commit("first change"). + Checkout("original-branch"). + NewBranch("second-change-branch"). + UpdateFileAndAdd("file", SecondChangeFileContent). + Commit("second change"). + EmptyCommit("second-change-branch unrelated change"). + Checkout("first-change-branch") +} diff --git a/pkg/integration/tests/tests.go b/pkg/integration/tests/tests.go index 0721fbf17..9280347be 100644 --- a/pkg/integration/tests/tests.go +++ b/pkg/integration/tests/tests.go @@ -11,6 +11,7 @@ import ( "github.com/jesseduffield/lazygit/pkg/integration/components" "github.com/jesseduffield/lazygit/pkg/integration/tests/bisect" "github.com/jesseduffield/lazygit/pkg/integration/tests/branch" + "github.com/jesseduffield/lazygit/pkg/integration/tests/cherry_pick" "github.com/jesseduffield/lazygit/pkg/integration/tests/commit" "github.com/jesseduffield/lazygit/pkg/integration/tests/custom_commands" "github.com/jesseduffield/lazygit/pkg/integration/tests/interactive_rebase" @@ -33,6 +34,8 @@ var tests = []*components.IntegrationTest{ custom_commands.MenuFromCommand, bisect.Basic, bisect.FromOtherBranch, + cherry_pick.CherryPick, + cherry_pick.CherryPickConflicts, } func GetTests() []*components.IntegrationTest { @@ -55,6 +58,11 @@ func GetTests() []*components.IntegrationTest { return nil } + // the shared directory won't itself contain tests: only shared helper functions + if filepath.Base(filepath.Dir(path)) == "shared" { + return nil + } + nameFromPath := components.TestNameFromFilePath(path) if !testNamesSet.Includes(nameFromPath) { missingTestNames = append(missingTestNames, nameFromPath) diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/cherryPicking/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index e4df020f1..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1,15 +0,0 @@ -fourth commit on develop - -# 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 696a8fd -# Last commands done (2 commands done): -# pick 234e2fa third commit on develop -# pick 0556e5d fourth commit on develop -# No commands remaining. -# You are currently rebasing branch 'other_branch' on '696a8fd'. -# -# Changes to be committed: -# modified: file5 -# diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/HEAD b/test/integration/cherryPicking/expected/repo/.git_keep/HEAD deleted file mode 100644 index 904a2e296..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/other_branch diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/ORIG_HEAD b/test/integration/cherryPicking/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 343995424..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -696a8fd43c580b3bed203977faab4566b052a4e4 diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/REBASE_HEAD b/test/integration/cherryPicking/expected/repo/.git_keep/REBASE_HEAD deleted file mode 100644 index 40c059dd4..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/REBASE_HEAD +++ /dev/null @@ -1 +0,0 @@ -0556e5da1cda4e150d6cc1182be6efdb061f59fe diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/index b/test/integration/cherryPicking/expected/repo/.git_keep/index deleted file mode 100644 index f68534e4e..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/logs/HEAD b/test/integration/cherryPicking/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index d580b5c16..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,40 +0,0 @@ -0000000000000000000000000000000000000000 2cf63d6da8c52131dd79622f8572b44a1267e420 CI 1617673072 +1000 commit (initial): first commit -2cf63d6da8c52131dd79622f8572b44a1267e420 2cf63d6da8c52131dd79622f8572b44a1267e420 CI 1617673072 +1000 checkout: moving from master to feature/cherry-picking -2cf63d6da8c52131dd79622f8572b44a1267e420 e4aa98b835d0a871d9ea02e6d286f0fbb2204cdc CI 1617673072 +1000 commit: first commit freshman year -e4aa98b835d0a871d9ea02e6d286f0fbb2204cdc ef029771f117b5f31c972dfa546037662e243ca7 CI 1617673072 +1000 commit: second commit subway eat fresh -ef029771f117b5f31c972dfa546037662e243ca7 2493c87610e0a9b8edfca592cb01a027f60ce587 CI 1617673072 +1000 commit: third commit fresh -2493c87610e0a9b8edfca592cb01a027f60ce587 d8e5ca46d2bbd7c115e5849e637efe2361203368 CI 1617673072 +1000 commit: fourth commit cool -d8e5ca46d2bbd7c115e5849e637efe2361203368 78a5ec82970200538b70f5ac61c18acb45ccb8ee CI 1617673072 +1000 commit: fifth commit nice -78a5ec82970200538b70f5ac61c18acb45ccb8ee 19079c78db18112c5a2720896a040014a2d05f6d CI 1617673072 +1000 commit: sixth commit haha -19079c78db18112c5a2720896a040014a2d05f6d 4520f99d650662a3f597a200fea5f2599f528180 CI 1617673072 +1000 commit: seventh commit yeah -4520f99d650662a3f597a200fea5f2599f528180 9bb8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 CI 1617673072 +1000 commit: eighth commit woo -9bb8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 9bb8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 CI 1617673072 +1000 checkout: moving from feature/cherry-picking to develop -9bb8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 7923e4a952f4b169373b0389be6a9db3cd929547 CI 1617673072 +1000 commit: first commit on develop -7923e4a952f4b169373b0389be6a9db3cd929547 2cf63d6da8c52131dd79622f8572b44a1267e420 CI 1617673072 +1000 checkout: moving from develop to master -2cf63d6da8c52131dd79622f8572b44a1267e420 bfcc5725cd2ef871ff804996f4e02beef3e4dec2 CI 1617673072 +1000 commit: first commit on master -bfcc5725cd2ef871ff804996f4e02beef3e4dec2 7923e4a952f4b169373b0389be6a9db3cd929547 CI 1617673072 +1000 checkout: moving from master to develop -7923e4a952f4b169373b0389be6a9db3cd929547 7317cf7580efd92f974c8dfb3cde84eded8dafec CI 1617673072 +1000 commit: second commit on develop -7317cf7580efd92f974c8dfb3cde84eded8dafec bfcc5725cd2ef871ff804996f4e02beef3e4dec2 CI 1617673072 +1000 checkout: moving from develop to master -bfcc5725cd2ef871ff804996f4e02beef3e4dec2 f4ffac820a371104fe611d81bc13a45b70a3ebb3 CI 1617673072 +1000 commit: second commit on master -f4ffac820a371104fe611d81bc13a45b70a3ebb3 7317cf7580efd92f974c8dfb3cde84eded8dafec CI 1617673072 +1000 checkout: moving from master to develop -7317cf7580efd92f974c8dfb3cde84eded8dafec 234e2fa9a01b8d7e849b0c2a1bbd550e788ea18d CI 1617673072 +1000 commit: third commit on develop -234e2fa9a01b8d7e849b0c2a1bbd550e788ea18d f4ffac820a371104fe611d81bc13a45b70a3ebb3 CI 1617673072 +1000 checkout: moving from develop to master -f4ffac820a371104fe611d81bc13a45b70a3ebb3 facb56c48e4718f71c08116153c93d87bc699671 CI 1617673072 +1000 commit: third commit on master -facb56c48e4718f71c08116153c93d87bc699671 234e2fa9a01b8d7e849b0c2a1bbd550e788ea18d CI 1617673072 +1000 checkout: moving from master to develop -234e2fa9a01b8d7e849b0c2a1bbd550e788ea18d 0556e5da1cda4e150d6cc1182be6efdb061f59fe CI 1617673072 +1000 commit: fourth commit on develop -0556e5da1cda4e150d6cc1182be6efdb061f59fe facb56c48e4718f71c08116153c93d87bc699671 CI 1617673072 +1000 checkout: moving from develop to master -facb56c48e4718f71c08116153c93d87bc699671 339e2d062760be9ecdb4bb90f97bdb0e634e7831 CI 1617673072 +1000 commit: fourth commit on master -339e2d062760be9ecdb4bb90f97bdb0e634e7831 339e2d062760be9ecdb4bb90f97bdb0e634e7831 CI 1617673072 +1000 checkout: moving from master to base_branch -339e2d062760be9ecdb4bb90f97bdb0e634e7831 5d2484f3cb6ce658e296526c48e1a376b2790dfc CI 1617673072 +1000 commit: file -5d2484f3cb6ce658e296526c48e1a376b2790dfc 5d2484f3cb6ce658e296526c48e1a376b2790dfc CI 1617673072 +1000 checkout: moving from base_branch to other_branch -5d2484f3cb6ce658e296526c48e1a376b2790dfc 5d2484f3cb6ce658e296526c48e1a376b2790dfc CI 1617673072 +1000 checkout: moving from other_branch to base_branch -5d2484f3cb6ce658e296526c48e1a376b2790dfc 68728b56ed31d03ca94496b9e2a45c62ba0f4e8f CI 1617673072 +1000 commit: file changed -68728b56ed31d03ca94496b9e2a45c62ba0f4e8f 5d2484f3cb6ce658e296526c48e1a376b2790dfc CI 1617673072 +1000 checkout: moving from base_branch to other_branch -5d2484f3cb6ce658e296526c48e1a376b2790dfc 5d2484f3cb6ce658e296526c48e1a376b2790dfc CI 1617673078 +1000 rebase -i (start): checkout HEAD -5d2484f3cb6ce658e296526c48e1a376b2790dfc 65c0438e428cd1aa94588eaa52eb7ebad7ec62fd CI 1617673078 +1000 rebase -i (pick): second commit subway eat fresh -65c0438e428cd1aa94588eaa52eb7ebad7ec62fd 16f2bcca6ce7bcc17277103a5555072a6c3322a2 CI 1617673078 +1000 rebase -i (pick): third commit fresh -16f2bcca6ce7bcc17277103a5555072a6c3322a2 696a8fd43c580b3bed203977faab4566b052a4e4 CI 1617673078 +1000 rebase -i (pick): fourth commit cool -696a8fd43c580b3bed203977faab4566b052a4e4 696a8fd43c580b3bed203977faab4566b052a4e4 CI 1617673078 +1000 rebase -i (finish): returning to refs/heads/other_branch -696a8fd43c580b3bed203977faab4566b052a4e4 696a8fd43c580b3bed203977faab4566b052a4e4 CI 1617673084 +1000 rebase -i (start): checkout HEAD -696a8fd43c580b3bed203977faab4566b052a4e4 b8ab98a9ab0599193a3f41a9cc5cb988283e6722 CI 1617673088 +1000 rebase -i (continue): fourth commit on develop -b8ab98a9ab0599193a3f41a9cc5cb988283e6722 b8ab98a9ab0599193a3f41a9cc5cb988283e6722 CI 1617673088 +1000 rebase -i (finish): returning to refs/heads/other_branch diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/base_branch b/test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/base_branch deleted file mode 100644 index fbcf4b8c5..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/base_branch +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 339e2d062760be9ecdb4bb90f97bdb0e634e7831 CI 1617673072 +1000 branch: Created from HEAD -339e2d062760be9ecdb4bb90f97bdb0e634e7831 5d2484f3cb6ce658e296526c48e1a376b2790dfc CI 1617673072 +1000 commit: file -5d2484f3cb6ce658e296526c48e1a376b2790dfc 68728b56ed31d03ca94496b9e2a45c62ba0f4e8f CI 1617673072 +1000 commit: file changed diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/develop b/test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/develop deleted file mode 100644 index 3a497aff3..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/develop +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 9bb8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 CI 1617673072 +1000 branch: Created from HEAD -9bb8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 7923e4a952f4b169373b0389be6a9db3cd929547 CI 1617673072 +1000 commit: first commit on develop -7923e4a952f4b169373b0389be6a9db3cd929547 7317cf7580efd92f974c8dfb3cde84eded8dafec CI 1617673072 +1000 commit: second commit on develop -7317cf7580efd92f974c8dfb3cde84eded8dafec 234e2fa9a01b8d7e849b0c2a1bbd550e788ea18d CI 1617673072 +1000 commit: third commit on develop -234e2fa9a01b8d7e849b0c2a1bbd550e788ea18d 0556e5da1cda4e150d6cc1182be6efdb061f59fe CI 1617673072 +1000 commit: fourth commit on develop diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking b/test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking deleted file mode 100644 index 73326cc0a..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking +++ /dev/null @@ -1,9 +0,0 @@ -0000000000000000000000000000000000000000 2cf63d6da8c52131dd79622f8572b44a1267e420 CI 1617673072 +1000 branch: Created from HEAD -2cf63d6da8c52131dd79622f8572b44a1267e420 e4aa98b835d0a871d9ea02e6d286f0fbb2204cdc CI 1617673072 +1000 commit: first commit freshman year -e4aa98b835d0a871d9ea02e6d286f0fbb2204cdc ef029771f117b5f31c972dfa546037662e243ca7 CI 1617673072 +1000 commit: second commit subway eat fresh -ef029771f117b5f31c972dfa546037662e243ca7 2493c87610e0a9b8edfca592cb01a027f60ce587 CI 1617673072 +1000 commit: third commit fresh -2493c87610e0a9b8edfca592cb01a027f60ce587 d8e5ca46d2bbd7c115e5849e637efe2361203368 CI 1617673072 +1000 commit: fourth commit cool -d8e5ca46d2bbd7c115e5849e637efe2361203368 78a5ec82970200538b70f5ac61c18acb45ccb8ee CI 1617673072 +1000 commit: fifth commit nice -78a5ec82970200538b70f5ac61c18acb45ccb8ee 19079c78db18112c5a2720896a040014a2d05f6d CI 1617673072 +1000 commit: sixth commit haha -19079c78db18112c5a2720896a040014a2d05f6d 4520f99d650662a3f597a200fea5f2599f528180 CI 1617673072 +1000 commit: seventh commit yeah -4520f99d650662a3f597a200fea5f2599f528180 9bb8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 CI 1617673072 +1000 commit: eighth commit woo diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 5222ab232..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 2cf63d6da8c52131dd79622f8572b44a1267e420 CI 1617673072 +1000 commit (initial): first commit -2cf63d6da8c52131dd79622f8572b44a1267e420 bfcc5725cd2ef871ff804996f4e02beef3e4dec2 CI 1617673072 +1000 commit: first commit on master -bfcc5725cd2ef871ff804996f4e02beef3e4dec2 f4ffac820a371104fe611d81bc13a45b70a3ebb3 CI 1617673072 +1000 commit: second commit on master -f4ffac820a371104fe611d81bc13a45b70a3ebb3 facb56c48e4718f71c08116153c93d87bc699671 CI 1617673072 +1000 commit: third commit on master -facb56c48e4718f71c08116153c93d87bc699671 339e2d062760be9ecdb4bb90f97bdb0e634e7831 CI 1617673072 +1000 commit: fourth commit on master diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/other_branch b/test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/other_branch deleted file mode 100644 index eaa61b313..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/logs/refs/heads/other_branch +++ /dev/null @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 5d2484f3cb6ce658e296526c48e1a376b2790dfc CI 1617673072 +1000 branch: Created from HEAD -5d2484f3cb6ce658e296526c48e1a376b2790dfc 696a8fd43c580b3bed203977faab4566b052a4e4 CI 1617673078 +1000 rebase -i (finish): refs/heads/other_branch onto 5d2484f3cb6ce658e296526c48e1a376b2790dfc -696a8fd43c580b3bed203977faab4566b052a4e4 b8ab98a9ab0599193a3f41a9cc5cb988283e6722 CI 1617673088 +1000 rebase -i (finish): refs/heads/other_branch onto 696a8fd43c580b3bed203977faab4566b052a4e4 diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/05/56e5da1cda4e150d6cc1182be6efdb061f59fe b/test/integration/cherryPicking/expected/repo/.git_keep/objects/05/56e5da1cda4e150d6cc1182be6efdb061f59fe deleted file mode 100644 index 5b38a6350..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/05/56e5da1cda4e150d6cc1182be6efdb061f59fe and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d b/test/integration/cherryPicking/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d deleted file mode 100644 index 8d42c4c9e..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/16/f2bcca6ce7bcc17277103a5555072a6c3322a2 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/16/f2bcca6ce7bcc17277103a5555072a6c3322a2 deleted file mode 100644 index ad4358bf6..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/objects/16/f2bcca6ce7bcc17277103a5555072a6c3322a2 +++ /dev/null @@ -1,4 +0,0 @@ -x -0ay L]1&Ʉ -Ɩ7{ZoPCò -}Ig.gHڇ`,9ɛX?:X=OeE&=8Rv젂^} oOiPV9tG%c:/} _s? \ No newline at end of file diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 deleted file mode 100644 index 25389c9d6..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/17/3a40ed58e33060166ccbfb7d0ccc0387be5f09 and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c b/test/integration/cherryPicking/expected/repo/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c deleted file mode 100644 index fd879a5f3..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/17/4a8c9444cfa700682d74059d9fa9be5749242c and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 deleted file mode 100644 index 9b8af5fe7..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/18/f469bc737f6c2a589205e2ddefceb32a7cc3a7 and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/19/079c78db18112c5a2720896a040014a2d05f6d b/test/integration/cherryPicking/expected/repo/.git_keep/objects/19/079c78db18112c5a2720896a040014a2d05f6d deleted file mode 100644 index 6bca37063..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/19/079c78db18112c5a2720896a040014a2d05f6d and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca b/test/integration/cherryPicking/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca deleted file mode 100644 index 2b02dc3d1..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 deleted file mode 100644 index 1cafb95f9..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/20/85c8dd0a80e95ed959e4db2ab98f66b970ad77 and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/21/28c3c3def18d6e2a389957252fdb69ba85fce0 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/21/28c3c3def18d6e2a389957252fdb69ba85fce0 deleted file mode 100644 index 117d85d23..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/21/28c3c3def18d6e2a389957252fdb69ba85fce0 and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af b/test/integration/cherryPicking/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af deleted file mode 100644 index 27c11bb26..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 deleted file mode 100644 index 991774643..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/22/b0fd807dd5e428c2d818aef6a2311d7c11e885 and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/23/4e2fa9a01b8d7e849b0c2a1bbd550e788ea18d b/test/integration/cherryPicking/expected/repo/.git_keep/objects/23/4e2fa9a01b8d7e849b0c2a1bbd550e788ea18d deleted file mode 100644 index d3b98775c..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/objects/23/4e2fa9a01b8d7e849b0c2a1bbd550e788ea18d +++ /dev/null @@ -1,2 +0,0 @@ -xA -0E)f_(3&:J)13AAHZzzn_۶h/Tz@()y"`',z>#`K=jT^dhTTz I 2O؎Uo1o/TZ97e^Nyѷ0_- Ax \ No newline at end of file diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 deleted file mode 100644 index 864410e1e..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/24/6f7487e08e6330ccbec4053e701145d53f64d4 and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/24/93c87610e0a9b8edfca592cb01a027f60ce587 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/24/93c87610e0a9b8edfca592cb01a027f60ce587 deleted file mode 100644 index 2279fe5fe..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/objects/24/93c87610e0a9b8edfca592cb01a027f60ce587 +++ /dev/null @@ -1,3 +0,0 @@ -xK -0@]d2#L`m</ \ No newline at end of file diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/2c/f63d6da8c52131dd79622f8572b44a1267e420 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/2c/f63d6da8c52131dd79622f8572b44a1267e420 deleted file mode 100644 index 6738ae2c2..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/2c/f63d6da8c52131dd79622f8572b44a1267e420 and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 deleted file mode 100644 index ed74cea0a..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/2e/cced19ece4424e0d3f26eb3ea2ccb6bfeafaa8 and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/33/9e2d062760be9ecdb4bb90f97bdb0e634e7831 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/33/9e2d062760be9ecdb4bb90f97bdb0e634e7831 deleted file mode 100644 index 9a510fb59..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/objects/33/9e2d062760be9ecdb4bb90f97bdb0e634e7831 +++ /dev/null @@ -1,2 +0,0 @@ -xM - = ɏPJ!CǑj @_}ԪӄE361yCG*s OV&BY[~ٍR`!Th[p]ֻ||ޟros24jZk~ɟJm]/ @ \ No newline at end of file diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd b/test/integration/cherryPicking/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd deleted file mode 100644 index e8d63bced..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c b/test/integration/cherryPicking/expected/repo/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c deleted file mode 100644 index 394c5a294..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/36/e0ef3e52c6e29e64980c71defbab6064d2da8c and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/3e/0d4389ab458a8643281e494e3ebae7ce307eec b/test/integration/cherryPicking/expected/repo/.git_keep/objects/3e/0d4389ab458a8643281e494e3ebae7ce307eec deleted file mode 100644 index 3863853b0..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/objects/3e/0d4389ab458a8643281e494e3ebae7ce307eec +++ /dev/null @@ -1 +0,0 @@ -x} 0= QA6>1`|o w jyFJH7_0A𚐇} U)}FJ{oX9o6z[|G, \ No newline at end of file diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/45/20f99d650662a3f597a200fea5f2599f528180 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/45/20f99d650662a3f597a200fea5f2599f528180 deleted file mode 100644 index 009c19542..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/objects/45/20f99d650662a3f597a200fea5f2599f528180 +++ /dev/null @@ -1,3 +0,0 @@ -xK -0@]df@DcL)-5ނpx^k6`tBAgvlki)H$ؙEV7>fJ@ -{`HpA;b٦yrַ妇<#|aOh6M5S7}m/:L QR>8 \ No newline at end of file diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 deleted file mode 100644 index e0670d284..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 +++ /dev/null @@ -1 +0,0 @@ -x 0CvL\jVОW=MD4fhJe>}=N>NO[{hCzNuE֗Y{< \ No newline at end of file diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/69/6a8fd43c580b3bed203977faab4566b052a4e4 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/69/6a8fd43c580b3bed203977faab4566b052a4e4 deleted file mode 100644 index cd43a8fa0..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/69/6a8fd43c580b3bed203977faab4566b052a4e4 and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/6b/6092c6840d05583489cc32a1260db0d5390a98 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/6b/6092c6840d05583489cc32a1260db0d5390a98 deleted file mode 100644 index ab233877f..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/6b/6092c6840d05583489cc32a1260db0d5390a98 and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/73/17cf7580efd92f974c8dfb3cde84eded8dafec b/test/integration/cherryPicking/expected/repo/.git_keep/objects/73/17cf7580efd92f974c8dfb3cde84eded8dafec deleted file mode 100644 index 8d1ef58f3..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/objects/73/17cf7580efd92f974c8dfb3cde84eded8dafec +++ /dev/null @@ -1,2 +0,0 @@ -xK -0@]dI#LQ0MQ</jw0Z&3.`vȚYrD^iĦ8f"yH!fq)rz^6'8U>9V/zGjT?u_m<ڪ/:@ \ No newline at end of file diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 deleted file mode 100644 index c41ae5c62..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/78/3666de4acbb22a9efc205197667f5136118c54 and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/78/a5ec82970200538b70f5ac61c18acb45ccb8ee b/test/integration/cherryPicking/expected/repo/.git_keep/objects/78/a5ec82970200538b70f5ac61c18acb45ccb8ee deleted file mode 100644 index e7f686ab1..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/objects/78/a5ec82970200538b70f5ac61c18acb45ccb8ee +++ /dev/null @@ -1,2 +0,0 @@ -xI -@])^C~w@D*5 Ђ7UPy[awi@VC\8{]PSL)1dk褘Zw;;QahJPݦa0>-o˃h/޲7t̬NzN5:6ѯuP_?>c \ No newline at end of file diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/79/23e4a952f4b169373b0389be6a9db3cd929547 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/79/23e4a952f4b169373b0389be6a9db3cd929547 deleted file mode 100644 index 61b9dcca7..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/objects/79/23e4a952f4b169373b0389be6a9db3cd929547 +++ /dev/null @@ -1,3 +0,0 @@ -xK -0@]dL#N6%F{ܠxjU:ّw^1Ȝ {#~M4cAH\^|tG+lsɫjRa:wu_eYgupֈzL5SWy -e)f@f \ No newline at end of file diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d b/test/integration/cherryPicking/expected/repo/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d deleted file mode 100644 index d63de558b..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/88/9b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 deleted file mode 100644 index ea7fa5303..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd b/test/integration/cherryPicking/expected/repo/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd deleted file mode 100644 index cdd5f8a93..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/90/a84fd62f8033027fab3e567a81d5ed2a6a71cd and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c b/test/integration/cherryPicking/expected/repo/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c deleted file mode 100644 index 1befd67ac..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/95/9d7a10da71acf97b17300b40a3b4f30903e09c and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/9b/b8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/9b/b8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 deleted file mode 100644 index 0cbe05fda..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/9b/b8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 deleted file mode 100644 index ffc277c86..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c b/test/integration/cherryPicking/expected/repo/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c deleted file mode 100644 index 7302ca34e..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/af/a76754c933269d7cd45630a7184a20849dbe9c and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 deleted file mode 100644 index 4aa46eb8c..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/b4/121e2d6aa156227b6541431ddfb8594904b520 and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/b8/ab98a9ab0599193a3f41a9cc5cb988283e6722 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/b8/ab98a9ab0599193a3f41a9cc5cb988283e6722 deleted file mode 100644 index 5f7cb0d33..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/b8/ab98a9ab0599193a3f41a9cc5cb988283e6722 and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/bd/6f34089ba29cbae102003bd973e9f37a235c2e b/test/integration/cherryPicking/expected/repo/.git_keep/objects/bd/6f34089ba29cbae102003bd973e9f37a235c2e deleted file mode 100644 index e6bbae5e8..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/bd/6f34089ba29cbae102003bd973e9f37a235c2e and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/bf/cc5725cd2ef871ff804996f4e02beef3e4dec2 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/bf/cc5725cd2ef871ff804996f4e02beef3e4dec2 deleted file mode 100644 index 0f08b620f..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/objects/bf/cc5725cd2ef871ff804996f4e02beef3e4dec2 +++ /dev/null @@ -1,2 +0,0 @@ -xM -0a9I&?U,S߀p>Ze8 6k66ŸfOFsN{l0eWF,*֕C.Dؠ4ue%r9ҒJJ):Nu3ykG> \ No newline at end of file diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 deleted file mode 100644 index 008bb1a65..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/c1/dd146476a4a37fff75b88612a718281ea83b58 and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/ce/ecbe69460104e09eb2cd7c865df520c5679a68 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/ce/ecbe69460104e09eb2cd7c865df520c5679a68 deleted file mode 100644 index a5c693b79..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/ce/ecbe69460104e09eb2cd7c865df520c5679a68 and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 deleted file mode 100644 index ab357ec23..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/d0/60f7226715ca55b04e91fad2b8aca01badd993 and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 deleted file mode 100644 index 198bff1ec..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/d8/a7c50dcab42b2b62e5c77cdcece620d3964bd4 and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/d8/e5ca46d2bbd7c115e5849e637efe2361203368 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/d8/e5ca46d2bbd7c115e5849e637efe2361203368 deleted file mode 100644 index b69d3a536..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/objects/d8/e5ca46d2bbd7c115e5849e637efe2361203368 +++ /dev/null @@ -1,2 +0,0 @@ -xA - D kB)rQH!!+] ̼ʶ4\!3ԡKq170vnbΐB!ɀ,ώ κCS>UnlmaWCDT?q5i-ʪ? \ No newline at end of file diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 deleted file mode 100644 index af687b620..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/da/72a6dd6fbaaa4a2803a3c867437ab81a1a99a0 and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c b/test/integration/cherryPicking/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c deleted file mode 100644 index 74c919681..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c +++ /dev/null @@ -1 +0,0 @@ -x 0C?3ƵV=iO=,8tW@h*&R$j*yʑs-ܜ8v)u㧱VH" P \ No newline at end of file diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/cherryPicking/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e b/test/integration/cherryPicking/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e deleted file mode 100644 index 3a7ee91ea..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 deleted file mode 100644 index 714e20cb7..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/e4/48ae5bf6371d80ebee24a22b6df341797a6511 and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 deleted file mode 100644 index 83998943a..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/e4/aa98b835d0a871d9ea02e6d286f0fbb2204cdc b/test/integration/cherryPicking/expected/repo/.git_keep/objects/e4/aa98b835d0a871d9ea02e6d286f0fbb2204cdc deleted file mode 100644 index 5c0e48092..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/objects/e4/aa98b835d0a871d9ea02e6d286f0fbb2204cdc +++ /dev/null @@ -1,2 +0,0 @@ -xA -1=s$daOIJwx-ҥk'v~@ Udw"=U8HC% _O\˰O< cB`k/Kq8aK=.mb:kYܔk{vYT*w@{/B \ No newline at end of file diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d b/test/integration/cherryPicking/expected/repo/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d deleted file mode 100644 index b047d6827..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/ea/a48cb1e3d47e1b8b8df47bdc248e991207cc3d and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 deleted file mode 100644 index 4992422c7..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/eb/90e8d7b137a1d89480c9b22fd03199da77c9c7 and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/ef/029771f117b5f31c972dfa546037662e243ca7 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/ef/029771f117b5f31c972dfa546037662e243ca7 deleted file mode 100644 index 58cda6966..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/ef/029771f117b5f31c972dfa546037662e243ca7 and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 deleted file mode 100644 index 3688d63f9..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/f1/46c7f7b874778c1ad0cf9aebe45ec2427c7de2 and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/f3/7d8713ef1390c277b45a084a08c0c142ff7ed9 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/f3/7d8713ef1390c277b45a084a08c0c142ff7ed9 deleted file mode 100644 index 539d19c5f..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/objects/f3/7d8713ef1390c277b45a084a08c0c142ff7ed9 +++ /dev/null @@ -1,2 +0,0 @@ -x}K - Ʈ@QAAq bZOp7\b7 K:n3!k?O]m+*(O?X \ No newline at end of file diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 b/test/integration/cherryPicking/expected/repo/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 deleted file mode 100644 index 168b5c5f9..000000000 Binary files a/test/integration/cherryPicking/expected/repo/.git_keep/objects/fd/31cea7e0b6e8d334280be34db8dd86cdda3007 and /dev/null differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/base_branch b/test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/base_branch deleted file mode 100644 index 036ea7527..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/base_branch +++ /dev/null @@ -1 +0,0 @@ -68728b56ed31d03ca94496b9e2a45c62ba0f4e8f diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/develop b/test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/develop deleted file mode 100644 index 40c059dd4..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/develop +++ /dev/null @@ -1 +0,0 @@ -0556e5da1cda4e150d6cc1182be6efdb061f59fe diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/feature/cherry-picking b/test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/feature/cherry-picking deleted file mode 100644 index 0f0bd273a..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/feature/cherry-picking +++ /dev/null @@ -1 +0,0 @@ -9bb8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/master b/test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 6940df038..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -339e2d062760be9ecdb4bb90f97bdb0e634e7831 diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/other_branch b/test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/other_branch deleted file mode 100644 index f9041d125..000000000 --- a/test/integration/cherryPicking/expected/repo/.git_keep/refs/heads/other_branch +++ /dev/null @@ -1 +0,0 @@ -b8ab98a9ab0599193a3f41a9cc5cb988283e6722 diff --git a/test/integration/cherryPicking/expected/repo/cherrypicking3 b/test/integration/cherryPicking/expected/repo/cherrypicking3 deleted file mode 100644 index eb90e8d7b..000000000 --- a/test/integration/cherryPicking/expected/repo/cherrypicking3 +++ /dev/null @@ -1 +0,0 @@ -this is file number 3 that I'm going to cherry-pick diff --git a/test/integration/cherryPicking/expected/repo/cherrypicking4 b/test/integration/cherryPicking/expected/repo/cherrypicking4 deleted file mode 100644 index b4121e2d6..000000000 --- a/test/integration/cherryPicking/expected/repo/cherrypicking4 +++ /dev/null @@ -1 +0,0 @@ -this is file number 4 that I'm going to cherry-pick diff --git a/test/integration/cherryPicking/expected/repo/cherrypicking5 b/test/integration/cherryPicking/expected/repo/cherrypicking5 deleted file mode 100644 index afa76754c..000000000 --- a/test/integration/cherryPicking/expected/repo/cherrypicking5 +++ /dev/null @@ -1 +0,0 @@ -this is file number 5 that I'm going to cherry-pick diff --git a/test/integration/cherryPicking/expected/repo/directory/file b/test/integration/cherryPicking/expected/repo/directory/file deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/cherryPicking/expected/repo/directory/file +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/cherryPicking/expected/repo/directory/file2 b/test/integration/cherryPicking/expected/repo/directory/file2 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/cherryPicking/expected/repo/directory/file2 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/cherryPicking/expected/repo/file b/test/integration/cherryPicking/expected/repo/file deleted file mode 100644 index 5da4d9200..000000000 --- a/test/integration/cherryPicking/expected/repo/file +++ /dev/null @@ -1 +0,0 @@ -original1\noriginal2\noriginal3 diff --git a/test/integration/cherryPicking/expected/repo/file1 b/test/integration/cherryPicking/expected/repo/file1 deleted file mode 100644 index dcd348507..000000000 --- a/test/integration/cherryPicking/expected/repo/file1 +++ /dev/null @@ -1,63 +0,0 @@ -Here is a story that has been told throuhg the ages -once upon a time there was a cat -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -once upon a time there was another cat diff --git a/test/integration/cherryPicking/expected/repo/file3 b/test/integration/cherryPicking/expected/repo/file3 deleted file mode 100644 index e3ae5c6d8..000000000 --- a/test/integration/cherryPicking/expected/repo/file3 +++ /dev/null @@ -1 +0,0 @@ -once upon a time there was a horse diff --git a/test/integration/cherryPicking/expected/repo/file4 b/test/integration/cherryPicking/expected/repo/file4 deleted file mode 100644 index e3ae5c6d8..000000000 --- a/test/integration/cherryPicking/expected/repo/file4 +++ /dev/null @@ -1 +0,0 @@ -once upon a time there was a horse diff --git a/test/integration/cherryPicking/expected/repo/file5 b/test/integration/cherryPicking/expected/repo/file5 deleted file mode 100644 index 1b9ae5f5d..000000000 --- a/test/integration/cherryPicking/expected/repo/file5 +++ /dev/null @@ -1 +0,0 @@ -once upon a time there was a mouse diff --git a/test/integration/cherryPicking/recording.json b/test/integration/cherryPicking/recording.json deleted file mode 100644 index e1323235b..000000000 --- a/test/integration/cherryPicking/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":417,"Mod":0,"Key":259,"Ch":0},{"Timestamp":761,"Mod":0,"Key":258,"Ch":0},{"Timestamp":905,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1041,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1248,"Mod":0,"Key":13,"Ch":13},{"Timestamp":1537,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1656,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1809,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1929,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2065,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2193,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2344,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2481,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3112,"Mod":0,"Key":256,"Ch":99},{"Timestamp":3624,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3777,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4009,"Mod":0,"Key":256,"Ch":67},{"Timestamp":4697,"Mod":0,"Key":259,"Ch":0},{"Timestamp":4936,"Mod":0,"Key":256,"Ch":118},{"Timestamp":5296,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5881,"Mod":0,"Key":260,"Ch":0},{"Timestamp":6024,"Mod":0,"Key":260,"Ch":0},{"Timestamp":6456,"Mod":0,"Key":259,"Ch":0},{"Timestamp":6816,"Mod":0,"Key":256,"Ch":99},{"Timestamp":7041,"Mod":0,"Key":257,"Ch":0},{"Timestamp":7152,"Mod":0,"Key":256,"Ch":99},{"Timestamp":7329,"Mod":0,"Key":257,"Ch":0},{"Timestamp":7424,"Mod":0,"Key":256,"Ch":99},{"Timestamp":8040,"Mod":0,"Key":257,"Ch":0},{"Timestamp":8184,"Mod":0,"Key":257,"Ch":0},{"Timestamp":8329,"Mod":0,"Key":257,"Ch":0},{"Timestamp":8497,"Mod":0,"Key":257,"Ch":0},{"Timestamp":8673,"Mod":0,"Key":257,"Ch":0},{"Timestamp":8856,"Mod":0,"Key":257,"Ch":0},{"Timestamp":9041,"Mod":0,"Key":257,"Ch":0},{"Timestamp":9233,"Mod":0,"Key":257,"Ch":0},{"Timestamp":9640,"Mod":0,"Key":256,"Ch":99},{"Timestamp":10056,"Mod":0,"Key":258,"Ch":0},{"Timestamp":10208,"Mod":0,"Key":258,"Ch":0},{"Timestamp":10736,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10872,"Mod":0,"Key":256,"Ch":99},{"Timestamp":11361,"Mod":0,"Key":259,"Ch":0},{"Timestamp":11640,"Mod":0,"Key":256,"Ch":118},{"Timestamp":12048,"Mod":0,"Key":13,"Ch":13},{"Timestamp":12849,"Mod":0,"Key":13,"Ch":13},{"Timestamp":13152,"Mod":0,"Key":13,"Ch":13},{"Timestamp":13408,"Mod":0,"Key":256,"Ch":32},{"Timestamp":14009,"Mod":0,"Key":13,"Ch":13},{"Timestamp":14513,"Mod":0,"Key":13,"Ch":13},{"Timestamp":14833,"Mod":0,"Key":13,"Ch":13},{"Timestamp":15056,"Mod":0,"Key":258,"Ch":0},{"Timestamp":15296,"Mod":0,"Key":256,"Ch":32},{"Timestamp":16217,"Mod":0,"Key":13,"Ch":13},{"Timestamp":17593,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/cherryPicking/setup.sh b/test/integration/cherryPicking/setup.sh deleted file mode 100644 index 1a913412f..000000000 --- a/test/integration/cherryPicking/setup.sh +++ /dev/null @@ -1,157 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init -git config user.email "CI@example.com" -git config user.name "CI" - - -function add_spacing { - for i in {1..60} - do - echo "..." >> $1 - done -} - -mkdir directory -echo "test1" > directory/file -echo "test1" > directory/file2 - - -echo "Here is a story that has been told throuhg the ages" >> file1 - -git add file1 -git add directory -git commit -m "first commit" - -git checkout -b feature/cherry-picking - -echo "this is file number 1 that I'm going to cherry-pick" > cherrypicking1 -echo "this is file number 2 that I'm going to cherry-pick" > cherrypicking2 - -git add . - -git commit -am "first commit freshman year" - -echo "this is file number 3 that I'm going to cherry-pick" > cherrypicking3 - -git add . - -git commit -am "second commit subway eat fresh" - -echo "this is file number 4 that I'm going to cherry-pick" > cherrypicking4 - -git add . - -git commit -am "third commit fresh" - -echo "this is file number 5 that I'm going to cherry-pick" > cherrypicking5 - -git add . - -git commit -am "fourth commit cool" - -echo "this is file number 6 that I'm going to cherry-pick" > cherrypicking6 - -git add . - -git commit -am "fifth commit nice" - -echo "this is file number 7 that I'm going to cherry-pick" > cherrypicking7 - -git add . - -git commit -am "sixth commit haha" - -echo "this is file number 8 that I'm going to cherry-pick" > cherrypicking8 - -git add . - -git commit -am "seventh commit yeah" - -echo "this is file number 9 that I'm going to cherry-pick" > cherrypicking9 - -git add . - -git commit -am "eighth commit woo" - - -git checkout -b develop -echo "once upon a time there was a dog" >> file1 -add_spacing file1 -echo "once upon a time there was another dog" >> file1 -git add file1 -echo "test2" > directory/file -echo "test2" > directory/file2 -git add directory -git commit -m "first commit on develop" - - -git checkout master -echo "once upon a time there was a cat" >> file1 -add_spacing file1 -echo "once upon a time there was another cat" >> file1 -git add file1 -echo "test3" > directory/file -echo "test3" > directory/file2 -git add directory -git commit -m "first commit on master" - - -git checkout develop -echo "once upon a time there was a mouse" >> file3 -git add file3 -git commit -m "second commit on develop" - - -git checkout master -echo "once upon a time there was a horse" >> file3 -git add file3 -git commit -m "second commit on master" - - -git checkout develop -echo "once upon a time there was a mouse" >> file4 -git add file4 -git commit -m "third commit on develop" - - -git checkout master -echo "once upon a time there was a horse" >> file4 -git add file4 -git commit -m "third commit on master" - - -git checkout develop -echo "once upon a time there was a mouse" >> file5 -git add file5 -git commit -m "fourth commit on develop" - - -git checkout master -echo "once upon a time there was a horse" >> file5 -git add file5 -git commit -m "fourth commit on master" - - -# this is for the autostash feature - -git checkout -b base_branch - -echo "original1\noriginal2\noriginal3" > file -git add file -git commit -m "file" - -git checkout -b other_branch - -git checkout base_branch - -echo "new1\noriginal2\noriginal3" > file -git add file -git commit -m "file changed" - -git checkout other_branch - diff --git a/test/integration/cherryPicking/test.json b/test/integration/cherryPicking/test.json deleted file mode 100644 index e1cda77be..000000000 --- a/test/integration/cherryPicking/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "Cherry picking commits over from another branch via the sub commits context. Also resolving some merge conflicts along the way.", "speed": 5 } diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..851066514 --- /dev/null +++ b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +four diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/FETCH_HEAD b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/cherryPicking/expected/repo/.git_keep/FETCH_HEAD rename to test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/HEAD b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/HEAD new file mode 100644 index 000000000..2bf8fd13a --- /dev/null +++ b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/first-branch diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/ORIG_HEAD b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..bbfaa4f49 --- /dev/null +++ b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +c37c09bdd6f969542d7e94829662c5ac19f5fb7e diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/config b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/config similarity index 87% rename from test/integration/cherryPicking/expected/repo/.git_keep/config rename to test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/config index 8ae104545..8a748ce32 100644 --- a/test/integration/cherryPicking/expected/repo/.git_keep/config +++ b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/config @@ -8,3 +8,5 @@ [user] email = CI@example.com name = CI +[commit] + gpgSign = false diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/description b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/description similarity index 100% rename from test/integration/cherryPicking/expected/repo/.git_keep/description rename to test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/description diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/index b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/index new file mode 100644 index 000000000..65d675154 Binary files /dev/null and b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/index differ diff --git a/test/integration/cherryPicking/expected/repo/.git_keep/info/exclude b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/cherryPicking/expected/repo/.git_keep/info/exclude rename to test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/info/exclude diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/logs/HEAD b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..c558e2761 --- /dev/null +++ b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,14 @@ +0000000000000000000000000000000000000000 5b06c6c8d51ba89367991cc7b40dda5d827bb95a CI 1663390248 -0700 commit (initial): base +5b06c6c8d51ba89367991cc7b40dda5d827bb95a 5b06c6c8d51ba89367991cc7b40dda5d827bb95a CI 1663390248 -0700 checkout: moving from master to first-branch +5b06c6c8d51ba89367991cc7b40dda5d827bb95a 5b06c6c8d51ba89367991cc7b40dda5d827bb95a CI 1663390248 -0700 checkout: moving from first-branch to second-branch +5b06c6c8d51ba89367991cc7b40dda5d827bb95a 5b06c6c8d51ba89367991cc7b40dda5d827bb95a CI 1663390248 -0700 checkout: moving from second-branch to first-branch +5b06c6c8d51ba89367991cc7b40dda5d827bb95a 197a799a14b2ca7478cfe339e7c83f7cdea4918b CI 1663390248 -0700 commit: one +197a799a14b2ca7478cfe339e7c83f7cdea4918b c37c09bdd6f969542d7e94829662c5ac19f5fb7e CI 1663390248 -0700 commit: two +c37c09bdd6f969542d7e94829662c5ac19f5fb7e 5b06c6c8d51ba89367991cc7b40dda5d827bb95a CI 1663390248 -0700 checkout: moving from first-branch to second-branch +5b06c6c8d51ba89367991cc7b40dda5d827bb95a 198998809e08270eebeb746d6aed45df9faee6a2 CI 1663390248 -0700 commit: three +198998809e08270eebeb746d6aed45df9faee6a2 2b10745f8823e1d49edc446ea1440d7730a6625b CI 1663390248 -0700 commit: four +2b10745f8823e1d49edc446ea1440d7730a6625b c37c09bdd6f969542d7e94829662c5ac19f5fb7e CI 1663390248 -0700 checkout: moving from second-branch to first-branch +c37c09bdd6f969542d7e94829662c5ac19f5fb7e c37c09bdd6f969542d7e94829662c5ac19f5fb7e CI 1663390252 -0700 rebase (start): checkout HEAD +c37c09bdd6f969542d7e94829662c5ac19f5fb7e 5d9c4c2ff245b2b0112cfa90a529baa3f3e12c6f CI 1663390252 -0700 rebase (pick): three +5d9c4c2ff245b2b0112cfa90a529baa3f3e12c6f 9cf3d6426fc20e3ccf1a9b0e3fa593f136fee92e CI 1663390252 -0700 rebase (pick): four +9cf3d6426fc20e3ccf1a9b0e3fa593f136fee92e 9cf3d6426fc20e3ccf1a9b0e3fa593f136fee92e CI 1663390252 -0700 rebase (finish): returning to refs/heads/first-branch diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/logs/refs/heads/first-branch b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/logs/refs/heads/first-branch new file mode 100644 index 000000000..839c92cee --- /dev/null +++ b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/logs/refs/heads/first-branch @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 5b06c6c8d51ba89367991cc7b40dda5d827bb95a CI 1663390248 -0700 branch: Created from HEAD +5b06c6c8d51ba89367991cc7b40dda5d827bb95a 197a799a14b2ca7478cfe339e7c83f7cdea4918b CI 1663390248 -0700 commit: one +197a799a14b2ca7478cfe339e7c83f7cdea4918b c37c09bdd6f969542d7e94829662c5ac19f5fb7e CI 1663390248 -0700 commit: two +c37c09bdd6f969542d7e94829662c5ac19f5fb7e 9cf3d6426fc20e3ccf1a9b0e3fa593f136fee92e CI 1663390252 -0700 rebase (finish): refs/heads/first-branch onto c37c09bdd6f969542d7e94829662c5ac19f5fb7e diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/logs/refs/heads/master b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..f5df202bf --- /dev/null +++ b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 5b06c6c8d51ba89367991cc7b40dda5d827bb95a CI 1663390248 -0700 commit (initial): base diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/logs/refs/heads/second-branch b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/logs/refs/heads/second-branch new file mode 100644 index 000000000..41f63c795 --- /dev/null +++ b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/logs/refs/heads/second-branch @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 5b06c6c8d51ba89367991cc7b40dda5d827bb95a CI 1663390248 -0700 branch: Created from HEAD +5b06c6c8d51ba89367991cc7b40dda5d827bb95a 198998809e08270eebeb746d6aed45df9faee6a2 CI 1663390248 -0700 commit: three +198998809e08270eebeb746d6aed45df9faee6a2 2b10745f8823e1d49edc446ea1440d7730a6625b CI 1663390248 -0700 commit: four diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/19/7a799a14b2ca7478cfe339e7c83f7cdea4918b b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/19/7a799a14b2ca7478cfe339e7c83f7cdea4918b new file mode 100644 index 000000000..ec488017b Binary files /dev/null and b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/19/7a799a14b2ca7478cfe339e7c83f7cdea4918b differ diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/19/8998809e08270eebeb746d6aed45df9faee6a2 b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/19/8998809e08270eebeb746d6aed45df9faee6a2 new file mode 100644 index 000000000..d37e83906 --- /dev/null +++ b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/19/8998809e08270eebeb746d6aed45df9faee6a2 @@ -0,0 +1,2 @@ +xA +0@Q9E.Ld2"BW=Ff2ER"x|{x~p껙B!UTЄ XPEDE趲ۻ$J5 RG̃jT)dNŕOf}K^vѵ8 !?CpG=P]tb:( \ No newline at end of file diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/2b/10745f8823e1d49edc446ea1440d7730a6625b b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/2b/10745f8823e1d49edc446ea1440d7730a6625b new file mode 100644 index 000000000..862c1de53 Binary files /dev/null and b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/2b/10745f8823e1d49edc446ea1440d7730a6625b differ diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 new file mode 100644 index 000000000..adf64119a Binary files /dev/null and b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 differ diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/5b/06c6c8d51ba89367991cc7b40dda5d827bb95a b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/5b/06c6c8d51ba89367991cc7b40dda5d827bb95a new file mode 100644 index 000000000..a4f4279e7 --- /dev/null +++ b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/5b/06c6c8d51ba89367991cc7b40dda5d827bb95a @@ -0,0 +1,2 @@ +xA +0Fa9\@&1#E<=Z $_La)2F5.|X\{h27|s}=q*^iP !HG>3?N+ \ No newline at end of file diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/5d/9c4c2ff245b2b0112cfa90a529baa3f3e12c6f b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/5d/9c4c2ff245b2b0112cfa90a529baa3f3e12c6f new file mode 100644 index 000000000..8fdf508b8 Binary files /dev/null and b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/5d/9c4c2ff245b2b0112cfa90a529baa3f3e12c6f differ diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/9c/f3d6426fc20e3ccf1a9b0e3fa593f136fee92e b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/9c/f3d6426fc20e3ccf1a9b0e3fa593f136fee92e new file mode 100644 index 000000000..de1b77fe4 Binary files /dev/null and b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/9c/f3d6426fc20e3ccf1a9b0e3fa593f136fee92e differ diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/c3/7c09bdd6f969542d7e94829662c5ac19f5fb7e b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/c3/7c09bdd6f969542d7e94829662c5ac19f5fb7e new file mode 100644 index 000000000..829be3204 Binary files /dev/null and b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/objects/c3/7c09bdd6f969542d7e94829662c5ac19f5fb7e differ diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/refs/heads/first-branch b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/refs/heads/first-branch new file mode 100644 index 000000000..52ca93d1e --- /dev/null +++ b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/refs/heads/first-branch @@ -0,0 +1 @@ +9cf3d6426fc20e3ccf1a9b0e3fa593f136fee92e diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/refs/heads/master b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..dca03b464 --- /dev/null +++ b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +5b06c6c8d51ba89367991cc7b40dda5d827bb95a diff --git a/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/refs/heads/second-branch b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/refs/heads/second-branch new file mode 100644 index 000000000..0d1ec1f3a --- /dev/null +++ b/test/integration_new/cherry_pick/cherry_pick/expected/repo/.git_keep/refs/heads/second-branch @@ -0,0 +1 @@ +2b10745f8823e1d49edc446ea1440d7730a6625b diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..01f5cbba2 --- /dev/null +++ b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/COMMIT_EDITMSG @@ -0,0 +1,15 @@ +second change + +# 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 ccc8b92 +# Last command done (1 command done): +# pick dddf38b second change +# Next command to do (1 remaining command): +# pick dae6bc0 second-change-branch unrelated change +# You are currently rebasing branch 'first-change-branch' on 'ccc8b92'. +# +# Changes to be committed: +# modified: file +# diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/FETCH_HEAD b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/HEAD b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/HEAD new file mode 100644 index 000000000..e1c7bf8c5 --- /dev/null +++ b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/first-change-branch diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/ORIG_HEAD b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..b303a7622 --- /dev/null +++ b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +ccc8b929484ac23c527c54d1a109f20b16f5a006 diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/config b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/config new file mode 100644 index 000000000..8a748ce32 --- /dev/null +++ b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/config @@ -0,0 +1,12 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[user] + email = CI@example.com + name = CI +[commit] + gpgSign = false diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/description b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/index b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/index new file mode 100644 index 000000000..b9ff2c0de Binary files /dev/null and b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/index differ diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/info/exclude b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/info/exclude @@ -0,0 +1,7 @@ +# 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_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/logs/HEAD b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..41ddb58b4 --- /dev/null +++ b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,15 @@ +0000000000000000000000000000000000000000 1091767dde559ffdc97b64f1536955253b931e50 CI 1663391521 -0700 commit (initial): one +1091767dde559ffdc97b64f1536955253b931e50 ad9b1c669fdc039038e54fc497f3e888cc4654e0 CI 1663391521 -0700 commit: two +ad9b1c669fdc039038e54fc497f3e888cc4654e0 1f9963859d30c1bfe620e9121f3d689a07a35519 CI 1663391521 -0700 commit: three +1f9963859d30c1bfe620e9121f3d689a07a35519 977cb37e46b9a00e19e6f99c5c179a30b990ca3d CI 1663391521 -0700 commit: original +977cb37e46b9a00e19e6f99c5c179a30b990ca3d 977cb37e46b9a00e19e6f99c5c179a30b990ca3d CI 1663391521 -0700 checkout: moving from original-branch to first-change-branch +977cb37e46b9a00e19e6f99c5c179a30b990ca3d ccc8b929484ac23c527c54d1a109f20b16f5a006 CI 1663391521 -0700 commit: first change +ccc8b929484ac23c527c54d1a109f20b16f5a006 977cb37e46b9a00e19e6f99c5c179a30b990ca3d CI 1663391521 -0700 checkout: moving from first-change-branch to original-branch +977cb37e46b9a00e19e6f99c5c179a30b990ca3d 977cb37e46b9a00e19e6f99c5c179a30b990ca3d CI 1663391521 -0700 checkout: moving from original-branch to second-change-branch +977cb37e46b9a00e19e6f99c5c179a30b990ca3d dddf38b00920854961ad30512b3b174141e877b4 CI 1663391521 -0700 commit: second change +dddf38b00920854961ad30512b3b174141e877b4 dae6bc03641275886fa12a2a00c01edd6e975d99 CI 1663391521 -0700 commit: second-change-branch unrelated change +dae6bc03641275886fa12a2a00c01edd6e975d99 ccc8b929484ac23c527c54d1a109f20b16f5a006 CI 1663391521 -0700 checkout: moving from second-change-branch to first-change-branch +ccc8b929484ac23c527c54d1a109f20b16f5a006 ccc8b929484ac23c527c54d1a109f20b16f5a006 CI 1663391521 -0700 rebase (start): checkout HEAD +ccc8b929484ac23c527c54d1a109f20b16f5a006 e010d664020f79e46ef7f8bf2a1508fe0864109c CI 1663391522 -0700 rebase (continue): second change +e010d664020f79e46ef7f8bf2a1508fe0864109c 948965327ab8404a12fb80d9490ded95969431d1 CI 1663391522 -0700 rebase (continue) (pick): second-change-branch unrelated change +948965327ab8404a12fb80d9490ded95969431d1 948965327ab8404a12fb80d9490ded95969431d1 CI 1663391522 -0700 rebase (continue) (finish): returning to refs/heads/first-change-branch diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/logs/refs/heads/first-change-branch b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/logs/refs/heads/first-change-branch new file mode 100644 index 000000000..ff417251b --- /dev/null +++ b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/logs/refs/heads/first-change-branch @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 977cb37e46b9a00e19e6f99c5c179a30b990ca3d CI 1663391521 -0700 branch: Created from HEAD +977cb37e46b9a00e19e6f99c5c179a30b990ca3d ccc8b929484ac23c527c54d1a109f20b16f5a006 CI 1663391521 -0700 commit: first change +ccc8b929484ac23c527c54d1a109f20b16f5a006 948965327ab8404a12fb80d9490ded95969431d1 CI 1663391522 -0700 rebase (continue) (finish): refs/heads/first-change-branch onto ccc8b929484ac23c527c54d1a109f20b16f5a006 diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/logs/refs/heads/original-branch b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/logs/refs/heads/original-branch new file mode 100644 index 000000000..b9f592467 --- /dev/null +++ b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/logs/refs/heads/original-branch @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 1091767dde559ffdc97b64f1536955253b931e50 CI 1663391521 -0700 commit (initial): one +1091767dde559ffdc97b64f1536955253b931e50 ad9b1c669fdc039038e54fc497f3e888cc4654e0 CI 1663391521 -0700 commit: two +ad9b1c669fdc039038e54fc497f3e888cc4654e0 1f9963859d30c1bfe620e9121f3d689a07a35519 CI 1663391521 -0700 commit: three +1f9963859d30c1bfe620e9121f3d689a07a35519 977cb37e46b9a00e19e6f99c5c179a30b990ca3d CI 1663391521 -0700 commit: original diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/logs/refs/heads/second-change-branch b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/logs/refs/heads/second-change-branch new file mode 100644 index 000000000..09842646b --- /dev/null +++ b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/logs/refs/heads/second-change-branch @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 977cb37e46b9a00e19e6f99c5c179a30b990ca3d CI 1663391521 -0700 branch: Created from HEAD +977cb37e46b9a00e19e6f99c5c179a30b990ca3d dddf38b00920854961ad30512b3b174141e877b4 CI 1663391521 -0700 commit: second change +dddf38b00920854961ad30512b3b174141e877b4 dae6bc03641275886fa12a2a00c01edd6e975d99 CI 1663391521 -0700 commit: second-change-branch unrelated change diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179 b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179 new file mode 100644 index 000000000..bd9b135ac Binary files /dev/null and b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179 differ diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/10/91767dde559ffdc97b64f1536955253b931e50 b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/10/91767dde559ffdc97b64f1536955253b931e50 new file mode 100644 index 000000000..e347adc6e --- /dev/null +++ b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/10/91767dde559ffdc97b64f1536955253b931e50 @@ -0,0 +1,3 @@ +xQ +0 a{\@I4 2ӎt +ʨ#_Z73`"LE4eEŸ'd6fMh\?/VE!@xEtG=&䮽{+d \ No newline at end of file diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/11/0d6e0b946c9d9b9b5e44c29d98692e925c368c b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/11/0d6e0b946c9d9b9b5e44c29d98692e925c368c new file mode 100644 index 000000000..a893c2563 Binary files /dev/null and b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/11/0d6e0b946c9d9b9b5e44c29d98692e925c368c differ diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804 b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804 new file mode 100644 index 000000000..3f0746de5 Binary files /dev/null and b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804 differ diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/1f/332f64cb03c06913491af20cd407158776bd55 b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/1f/332f64cb03c06913491af20cd407158776bd55 new file mode 100644 index 000000000..8cded6c81 Binary files /dev/null and b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/1f/332f64cb03c06913491af20cd407158776bd55 differ diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/1f/9963859d30c1bfe620e9121f3d689a07a35519 b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/1f/9963859d30c1bfe620e9121f3d689a07a35519 new file mode 100644 index 000000000..ac11d698a Binary files /dev/null and b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/1f/9963859d30c1bfe620e9121f3d689a07a35519 differ diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/2a/ccf5d0d5f4c2501627da4aebeda580cd86f0eb b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/2a/ccf5d0d5f4c2501627da4aebeda580cd86f0eb new file mode 100644 index 000000000..e4ca8d59a Binary files /dev/null and b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/2a/ccf5d0d5f4c2501627da4aebeda580cd86f0eb differ diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/3a/ac30738b0dda38d964abe6c2386603f9309a65 b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/3a/ac30738b0dda38d964abe6c2386603f9309a65 new file mode 100644 index 000000000..1f72f9aee Binary files /dev/null and b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/3a/ac30738b0dda38d964abe6c2386603f9309a65 differ diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 new file mode 100644 index 000000000..adf64119a Binary files /dev/null and b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 differ diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/4c/16472189d1db34cb67b99439725202216e26d9 b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/4c/16472189d1db34cb67b99439725202216e26d9 new file mode 100644 index 000000000..9d9452bdd Binary files /dev/null and b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/4c/16472189d1db34cb67b99439725202216e26d9 differ diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/94/8965327ab8404a12fb80d9490ded95969431d1 b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/94/8965327ab8404a12fb80d9490ded95969431d1 new file mode 100644 index 000000000..6510f0fd1 Binary files /dev/null and b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/94/8965327ab8404a12fb80d9490ded95969431d1 differ diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/97/7cb37e46b9a00e19e6f99c5c179a30b990ca3d b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/97/7cb37e46b9a00e19e6f99c5c179a30b990ca3d new file mode 100644 index 000000000..6f3ae7c4c Binary files /dev/null and b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/97/7cb37e46b9a00e19e6f99c5c179a30b990ca3d differ diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/ad/9b1c669fdc039038e54fc497f3e888cc4654e0 b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/ad/9b1c669fdc039038e54fc497f3e888cc4654e0 new file mode 100644 index 000000000..7e87c8613 Binary files /dev/null and b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/ad/9b1c669fdc039038e54fc497f3e888cc4654e0 differ diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/cc/c8b929484ac23c527c54d1a109f20b16f5a006 b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/cc/c8b929484ac23c527c54d1a109f20b16f5a006 new file mode 100644 index 000000000..52f8a5e1e --- /dev/null +++ b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/cc/c8b929484ac23c527c54d1a109f20b16f5a006 @@ -0,0 +1,2 @@ +xM +0@a9E.t〈UL'`R#x|{odunOmWXd H1dt_c yliץYQ2Eu!sPd Y`DA&}ڴMu{EzО!SMYT@; \ No newline at end of file diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/da/e6bc03641275886fa12a2a00c01edd6e975d99 b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/da/e6bc03641275886fa12a2a00c01edd6e975d99 new file mode 100644 index 000000000..de1b67169 --- /dev/null +++ b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/da/e6bc03641275886fa12a2a00c01edd6e975d99 @@ -0,0 +1,3 @@ +xQj!>{uRy1^_}`CYm23M-Ŧ!V "kl,2'CZksQŸ(W+YqBɓFf&v \r=Ow=c +D%X[SSץlt{Շ +n~fD \ No newline at end of file diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/dd/df38b00920854961ad30512b3b174141e877b4 b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/dd/df38b00920854961ad30512b3b174141e877b4 new file mode 100644 index 000000000..32ec66bbf --- /dev/null +++ b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/dd/df38b00920854961ad30512b3b174141e877b4 @@ -0,0 +1,2 @@ +xA +0@Q9\@$6cLT0m<=[}SDRW(V!rb+-YeӹI! e 9yG11c_|c`2N7J[_zK {pDB4{ݧ[2j~E< \ No newline at end of file diff --git a/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/e0/10d664020f79e46ef7f8bf2a1508fe0864109c b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/e0/10d664020f79e46ef7f8bf2a1508fe0864109c new file mode 100644 index 000000000..8801370d5 --- /dev/null +++ b/test/integration_new/cherry_pick/cherry_pick_conflicts/expected/repo/.git_keep/objects/e0/10d664020f79e46ef7f8bf2a1508fe0864109c @@ -0,0 +1,2 @@ +xM +0@a9E.L&]DӖۅ{oxi5&` R1Xb 9[Zikf9a@vC1d Ul|u}88]Cm}ʉv{kqh>W/e.4D}'