diff --git a/cmd/integration_test/main.go b/cmd/integration_test/main.go index 83321fc34..dc0cede86 100644 --- a/cmd/integration_test/main.go +++ b/cmd/integration_test/main.go @@ -13,7 +13,7 @@ Usage: See https://github.com/jesseduffield/lazygit/tree/master/pkg/integration/README.md CLI mode: - > go run cmd/integration_test/main.go cli [--slow] ... + > go run cmd/integration_test/main.go cli [--slow] [--sandbox] ... If you pass no test names, it runs all tests Accepted environment variables: KEY_PRESS_DELAY (e.g. 200): the number of milliseconds to wait between keypresses @@ -42,12 +42,19 @@ func main() { case "cli": testNames := os.Args[2:] slow := false + sandbox := false // get the next arg if it's --slow - if len(os.Args) > 2 && (os.Args[2] == "--slow" || os.Args[2] == "-slow") { - testNames = os.Args[3:] - slow = true + if len(os.Args) > 2 { + if os.Args[2] == "--slow" || os.Args[2] == "-slow" { + testNames = os.Args[3:] + slow = true + } else if os.Args[2] == "--sandbox" || os.Args[2] == "-sandbox" { + testNames = os.Args[3:] + sandbox = true + } } - clients.RunCLI(testNames, slow) + + clients.RunCLI(testNames, slow, sandbox) case "tui": clients.RunTUI() default: diff --git a/pkg/integration/README.md b/pkg/integration/README.md index 916149cea..4b745895a 100644 --- a/pkg/integration/README.md +++ b/pkg/integration/README.md @@ -11,7 +11,7 @@ go run cmd/integration_test/main.go tui or ```sh -go run cmd/integration_test/main.go cli [--slow] [testname or testpath...] +go run cmd/integration_test/main.go cli [--slow or --sandbox] [testname or testpath...] ``` ## Writing tests @@ -49,7 +49,7 @@ If you find yourself doing something frequently in a test, consider making it a There are three ways to invoke a test: -1. go run cmd/integration_test/main.go cli [--slow] [testname or testpath...] +1. go run cmd/integration_test/main.go cli [--slow or --sandbox] [testname or testpath...] 2. go run cmd/integration_test/main.go tui 3. go test pkg/integration/clients/go_test.go @@ -69,7 +69,7 @@ At the moment (this is subject to change) each test has a snapshot repo created Say you want to do a manual test of how lazygit handles merge-conflicts, but you can't be bothered actually finding a way to create merge conflicts in a repo. To make your life easier, you can simply run a merge-conflicts test in sandbox mode, meaning the setup step is run for you, and then instead of the test driving the lazygit session, you're allowed to drive it yourself. -To run a test in sandbox mode you can press 's' on a test in the test TUI or pass the env var MODE=sandbox to the test runner. +To run a test in sandbox mode you can press 's' on a test in the test TUI or in the test runner pass MODE=sandbox or the --sandbox argument. ## Migration process diff --git a/pkg/integration/clients/cli.go b/pkg/integration/clients/cli.go index 17c379c85..0222bd129 100644 --- a/pkg/integration/clients/cli.go +++ b/pkg/integration/clients/cli.go @@ -23,18 +23,25 @@ import ( // If invoked directly, you can specify tests to run by passing their names as positional arguments -func RunCLI(testNames []string, slow bool) { +func RunCLI(testNames []string, slow bool, sandbox bool) { keyPressDelay := tryConvert(os.Getenv("KEY_PRESS_DELAY"), 0) if slow { keyPressDelay = SLOW_KEY_PRESS_DELAY } + var mode components.Mode + if sandbox { + mode = components.SANDBOX + } else { + mode = getModeFromEnv() + } + err := components.RunTests( getTestsToRun(testNames), log.Printf, runCmdInTerminal, runAndPrintFatalError, - getModeFromEnv(), + mode, keyPressDelay, ) if err != nil { diff --git a/pkg/integration/components/shell.go b/pkg/integration/components/shell.go index 7b7a68543..b49921348 100644 --- a/pkg/integration/components/shell.go +++ b/pkg/integration/components/shell.go @@ -40,6 +40,15 @@ func (s *Shell) CreateFile(path string, content string) *Shell { return s } +func (s *Shell) UpdateFile(path string, content string) *Shell { + err := ioutil.WriteFile(path, []byte(content), 0o644) + if err != nil { + panic(fmt.Sprintf("error updating file: %s\n%s", path, err)) + } + + return s +} + func (s *Shell) NewBranch(name string) *Shell { return s.RunCommand("git checkout -b " + name) } @@ -71,6 +80,13 @@ func (s *Shell) CreateFileAndAdd(fileName string, fileContents string) *Shell { GitAdd(fileName) } +// convenience method for updating a file and adding it +func (s *Shell) UpdateFileAndAdd(fileName string, fileContents string) *Shell { + return s. + UpdateFile(fileName, fileContents). + GitAdd(fileName) +} + // creates commits 01, 02, 03, ..., n with a new file in each // The reason for padding with zeroes is so that it's easier to do string // matches on the commit messages when there are many of them diff --git a/pkg/integration/tests/branch/rebase.go b/pkg/integration/tests/branch/rebase.go new file mode 100644 index 000000000..eda7567e7 --- /dev/null +++ b/pkg/integration/tests/branch/rebase.go @@ -0,0 +1,94 @@ +package branch + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "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 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) + }, + 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.PressKeys(keys.Branches.RebaseBranch) + + assert.InConfirm() + assert.MatchCurrentViewContent(Contains("Are you sure you want to rebase 'first-change-branch' onto 'second-change-branch'?")) + input.Confirm() + + assert.InConfirm() + 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") + input.PrimaryAction() + + assert.InConfirm() + assert.MatchCurrentViewContent(Contains("all merge conflicts resolved. Continue?")) + input.Confirm() + + // this proves we actually have integrated the changes from second-change-branch + assert.MatchViewContent("commits", Contains("second-change-branch unrelated change")) + }, +}) diff --git a/pkg/integration/tests/branch/rebase_and_drop.go b/pkg/integration/tests/branch/rebase_and_drop.go new file mode 100644 index 000000000..18ffdd820 --- /dev/null +++ b/pkg/integration/tests/branch/rebase_and_drop.go @@ -0,0 +1,63 @@ +package branch + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Rebase onto another branch, deal with the conflicts. Also mark a commit to be dropped before continuing.", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + commonRebaseSetup(shell) + // addin a couple additional commits so that we can drop one + shell.EmptyCommit("to drop") + shell.EmptyCommit("to keep") + }, + 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.PressKeys(keys.Branches.RebaseBranch) + + assert.InConfirm() + assert.MatchCurrentViewContent(Contains("Are you sure you want to rebase 'first-change-branch' onto 'second-change-branch'?")) + input.Confirm() + + assert.InConfirm() + assert.MatchCurrentViewContent(Contains("Conflicts!")) + input.Confirm() + + assert.CurrentViewName("files") + assert.MatchSelectedLine(Contains("file")) + + input.SwitchToCommitsWindow() + input.NextItem() + input.PressKeys(keys.Universal.Remove) + assert.MatchSelectedLine(Contains("to drop")) + assert.MatchSelectedLine(Contains("drop")) + + input.SwitchToFilesWindow() + + // 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") + input.PrimaryAction() + + assert.InConfirm() + assert.MatchCurrentViewContent(Contains("all merge conflicts resolved. Continue?")) + input.Confirm() + + // this proves we actually have integrated the changes from second-change-branch + assert.MatchViewContent("commits", Contains("second-change-branch unrelated change")) + assert.MatchViewContent("commits", Contains("to keep")) + assert.MatchViewContent("commits", NotContains("to drop")) + }, +}) diff --git a/pkg/integration/tests/tests.go b/pkg/integration/tests/tests.go index 88f6b40da..0721fbf17 100644 --- a/pkg/integration/tests/tests.go +++ b/pkg/integration/tests/tests.go @@ -25,6 +25,8 @@ var tests = []*components.IntegrationTest{ commit.NewBranch, branch.Suggestions, branch.Delete, + branch.Rebase, + branch.RebaseAndDrop, interactive_rebase.One, custom_commands.Basic, custom_commands.MultiplePrompts, diff --git a/test/integration/branchRebase/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/branchRebase/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 42bf03720..000000000 --- a/test/integration/branchRebase/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1,18 +0,0 @@ -first commit on master - -# 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 e957aaf -# Last command done (1 command done): -# pick 69f11ae first commit on master -# Next commands to do (3 remaining commands): -# drop 8d3bd1c second commit on master -# drop 3e1706c third commit on master -# You are currently rebasing branch 'master' on 'e957aaf'. -# -# Changes to be committed: -# modified: directory/file -# modified: directory/file2 -# modified: file1 -# diff --git a/test/integration/branchRebase/expected/repo/.git_keep/HEAD b/test/integration/branchRebase/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/branchRebase/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/branchRebase/expected/repo/.git_keep/ORIG_HEAD b/test/integration/branchRebase/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index 28cab2e49..000000000 --- a/test/integration/branchRebase/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -69f11ae88c8712fe38ffd0fe9ff9df05371500a6 diff --git a/test/integration/branchRebase/expected/repo/.git_keep/index b/test/integration/branchRebase/expected/repo/.git_keep/index deleted file mode 100644 index 12d743587..000000000 Binary files a/test/integration/branchRebase/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/branchRebase/expected/repo/.git_keep/logs/HEAD b/test/integration/branchRebase/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index e4a5b4d7a..000000000 --- a/test/integration/branchRebase/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,22 +0,0 @@ -0000000000000000000000000000000000000000 3627f93f3cc779dc2f99484fb8ffa49953e43b2f CI 1643188754 +1100 commit (initial): first commit -3627f93f3cc779dc2f99484fb8ffa49953e43b2f 3627f93f3cc779dc2f99484fb8ffa49953e43b2f CI 1643188754 +1100 checkout: moving from master to develop -3627f93f3cc779dc2f99484fb8ffa49953e43b2f 9a6521a3788b4d9e679b1709130ff8dc3f73ab18 CI 1643188754 +1100 commit: first commit on develop -9a6521a3788b4d9e679b1709130ff8dc3f73ab18 3627f93f3cc779dc2f99484fb8ffa49953e43b2f CI 1643188754 +1100 checkout: moving from develop to master -3627f93f3cc779dc2f99484fb8ffa49953e43b2f 69f11ae88c8712fe38ffd0fe9ff9df05371500a6 CI 1643188754 +1100 commit: first commit on master -69f11ae88c8712fe38ffd0fe9ff9df05371500a6 9a6521a3788b4d9e679b1709130ff8dc3f73ab18 CI 1643188754 +1100 checkout: moving from master to develop -9a6521a3788b4d9e679b1709130ff8dc3f73ab18 a8381c9130b03aef530b60b5a4546b93dc59ae12 CI 1643188754 +1100 commit: second commit on develop -a8381c9130b03aef530b60b5a4546b93dc59ae12 69f11ae88c8712fe38ffd0fe9ff9df05371500a6 CI 1643188754 +1100 checkout: moving from develop to master -69f11ae88c8712fe38ffd0fe9ff9df05371500a6 8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 CI 1643188754 +1100 commit: second commit on master -8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 a8381c9130b03aef530b60b5a4546b93dc59ae12 CI 1643188754 +1100 checkout: moving from master to develop -a8381c9130b03aef530b60b5a4546b93dc59ae12 7095508e3cd0fd40572f8e711170db38ef2342d7 CI 1643188754 +1100 commit: third commit on develop -7095508e3cd0fd40572f8e711170db38ef2342d7 8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 CI 1643188754 +1100 checkout: moving from develop to master -8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 3e1706cdf670f5641be0715178471abfc9ed1748 CI 1643188754 +1100 commit: third commit on master -3e1706cdf670f5641be0715178471abfc9ed1748 7095508e3cd0fd40572f8e711170db38ef2342d7 CI 1643188754 +1100 checkout: moving from master to develop -7095508e3cd0fd40572f8e711170db38ef2342d7 e957aaf2eef0c03a9052b472d4862d9ee684c3e5 CI 1643188754 +1100 commit: fourth commit on develop -e957aaf2eef0c03a9052b472d4862d9ee684c3e5 3e1706cdf670f5641be0715178471abfc9ed1748 CI 1643188754 +1100 checkout: moving from develop to master -3e1706cdf670f5641be0715178471abfc9ed1748 f5067da83b48f8588edce682fd2715a575f34373 CI 1643188754 +1100 commit: fourth commit on master -f5067da83b48f8588edce682fd2715a575f34373 e957aaf2eef0c03a9052b472d4862d9ee684c3e5 CI 1643188756 +1100 rebase -i (start): checkout develop -e957aaf2eef0c03a9052b472d4862d9ee684c3e5 f5067da83b48f8588edce682fd2715a575f34373 CI 1643188757 +1100 rebase -i (abort): updating HEAD -f5067da83b48f8588edce682fd2715a575f34373 e957aaf2eef0c03a9052b472d4862d9ee684c3e5 CI 1643188758 +1100 rebase -i (start): checkout develop -e957aaf2eef0c03a9052b472d4862d9ee684c3e5 42597904331c82f6d5c8c902755c8dfa5767ea95 CI 1643188766 +1100 rebase -i (continue): first commit on master -42597904331c82f6d5c8c902755c8dfa5767ea95 42597904331c82f6d5c8c902755c8dfa5767ea95 CI 1643188766 +1100 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/branchRebase/expected/repo/.git_keep/logs/refs/heads/develop b/test/integration/branchRebase/expected/repo/.git_keep/logs/refs/heads/develop deleted file mode 100644 index 06dc78ae9..000000000 --- a/test/integration/branchRebase/expected/repo/.git_keep/logs/refs/heads/develop +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 3627f93f3cc779dc2f99484fb8ffa49953e43b2f CI 1643188754 +1100 branch: Created from HEAD -3627f93f3cc779dc2f99484fb8ffa49953e43b2f 9a6521a3788b4d9e679b1709130ff8dc3f73ab18 CI 1643188754 +1100 commit: first commit on develop -9a6521a3788b4d9e679b1709130ff8dc3f73ab18 a8381c9130b03aef530b60b5a4546b93dc59ae12 CI 1643188754 +1100 commit: second commit on develop -a8381c9130b03aef530b60b5a4546b93dc59ae12 7095508e3cd0fd40572f8e711170db38ef2342d7 CI 1643188754 +1100 commit: third commit on develop -7095508e3cd0fd40572f8e711170db38ef2342d7 e957aaf2eef0c03a9052b472d4862d9ee684c3e5 CI 1643188754 +1100 commit: fourth commit on develop diff --git a/test/integration/branchRebase/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/branchRebase/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 1856f13e4..000000000 --- a/test/integration/branchRebase/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,6 +0,0 @@ -0000000000000000000000000000000000000000 3627f93f3cc779dc2f99484fb8ffa49953e43b2f CI 1643188754 +1100 commit (initial): first commit -3627f93f3cc779dc2f99484fb8ffa49953e43b2f 69f11ae88c8712fe38ffd0fe9ff9df05371500a6 CI 1643188754 +1100 commit: first commit on master -69f11ae88c8712fe38ffd0fe9ff9df05371500a6 8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 CI 1643188754 +1100 commit: second commit on master -8d3bd1cbd5560c759c78a948bc0d24acb9cfae73 3e1706cdf670f5641be0715178471abfc9ed1748 CI 1643188754 +1100 commit: third commit on master -3e1706cdf670f5641be0715178471abfc9ed1748 f5067da83b48f8588edce682fd2715a575f34373 CI 1643188754 +1100 commit: fourth commit on master -f5067da83b48f8588edce682fd2715a575f34373 42597904331c82f6d5c8c902755c8dfa5767ea95 CI 1643188766 +1100 rebase -i (finish): refs/heads/master onto e957aaf2eef0c03a9052b472d4862d9ee684c3e5 diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d b/test/integration/branchRebase/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d deleted file mode 100644 index 8d42c4c9e..000000000 Binary files a/test/integration/branchRebase/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d and /dev/null differ diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/branchRebase/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335..000000000 Binary files a/test/integration/branchRebase/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca b/test/integration/branchRebase/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca deleted file mode 100644 index 2b02dc3d1..000000000 Binary files a/test/integration/branchRebase/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca and /dev/null differ diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af b/test/integration/branchRebase/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af deleted file mode 100644 index 27c11bb26..000000000 Binary files a/test/integration/branchRebase/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af and /dev/null differ diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/2e/83133d8d6b88c588de66c3ff8405501b5215b4 b/test/integration/branchRebase/expected/repo/.git_keep/objects/2e/83133d8d6b88c588de66c3ff8405501b5215b4 deleted file mode 100644 index 7cc212f4e..000000000 Binary files a/test/integration/branchRebase/expected/repo/.git_keep/objects/2e/83133d8d6b88c588de66c3ff8405501b5215b4 and /dev/null differ diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd b/test/integration/branchRebase/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd deleted file mode 100644 index e8d63bced..000000000 Binary files a/test/integration/branchRebase/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd and /dev/null differ diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/36/27f93f3cc779dc2f99484fb8ffa49953e43b2f b/test/integration/branchRebase/expected/repo/.git_keep/objects/36/27f93f3cc779dc2f99484fb8ffa49953e43b2f deleted file mode 100644 index cd608da68..000000000 Binary files a/test/integration/branchRebase/expected/repo/.git_keep/objects/36/27f93f3cc779dc2f99484fb8ffa49953e43b2f and /dev/null differ diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/3e/1706cdf670f5641be0715178471abfc9ed1748 b/test/integration/branchRebase/expected/repo/.git_keep/objects/3e/1706cdf670f5641be0715178471abfc9ed1748 deleted file mode 100644 index fcb375444..000000000 --- a/test/integration/branchRebase/expected/repo/.git_keep/objects/3e/1706cdf670f5641be0715178471abfc9ed1748 +++ /dev/null @@ -1,2 +0,0 @@ -xA -0a9II2cLiR#x| ^VawL 6ZP HVg.Tl*&9Re@)%Xﾴ t! GkC8:T?s՗u/SОPu`.? \ No newline at end of file diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/42/1b29bba240f23ea39e216bb0873cd4012624b5 b/test/integration/branchRebase/expected/repo/.git_keep/objects/42/1b29bba240f23ea39e216bb0873cd4012624b5 deleted file mode 100644 index 6ad1bf9cd..000000000 Binary files a/test/integration/branchRebase/expected/repo/.git_keep/objects/42/1b29bba240f23ea39e216bb0873cd4012624b5 and /dev/null differ diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/42/597904331c82f6d5c8c902755c8dfa5767ea95 b/test/integration/branchRebase/expected/repo/.git_keep/objects/42/597904331c82f6d5c8c902755c8dfa5767ea95 deleted file mode 100644 index 1c62a2241..000000000 Binary files a/test/integration/branchRebase/expected/repo/.git_keep/objects/42/597904331c82f6d5c8c902755c8dfa5767ea95 and /dev/null differ diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 b/test/integration/branchRebase/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 deleted file mode 100644 index e0670d284..000000000 --- a/test/integration/branchRebase/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 +++ /dev/null @@ -1 +0,0 @@ -x 0CvL\jVОW=Mifv piA*FYWAYae3_-MA" \ No newline at end of file diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 b/test/integration/branchRebase/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 deleted file mode 100644 index ffc277c86..000000000 Binary files a/test/integration/branchRebase/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 and /dev/null differ diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 b/test/integration/branchRebase/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 deleted file mode 100644 index 285df3e5f..000000000 Binary files a/test/integration/branchRebase/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 and /dev/null differ diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/a8/381c9130b03aef530b60b5a4546b93dc59ae12 b/test/integration/branchRebase/expected/repo/.git_keep/objects/a8/381c9130b03aef530b60b5a4546b93dc59ae12 deleted file mode 100644 index 8ed23d6aa..000000000 --- a/test/integration/branchRebase/expected/repo/.git_keep/objects/a8/381c9130b03aef530b60b5a4546b93dc59ae12 +++ /dev/null @@ -1,2 +0,0 @@ -x -0E]+f/H&DyLQMQ| pWs67ɺ̑4ɸD\5Q7i_gRkdwlkbƠ#&@)#귶0yISi[B,V;OuSWO)mˠ-P-/8|? \ No newline at end of file diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/cb/289e645aed5251ce74fa2eaf0cd1145b9cb014 b/test/integration/branchRebase/expected/repo/.git_keep/objects/cb/289e645aed5251ce74fa2eaf0cd1145b9cb014 deleted file mode 100644 index 8f0889223..000000000 Binary files a/test/integration/branchRebase/expected/repo/.git_keep/objects/cb/289e645aed5251ce74fa2eaf0cd1145b9cb014 and /dev/null differ diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/cc/52f7d833c761b3b11a5fa1ae76ba9aba2edd6f b/test/integration/branchRebase/expected/repo/.git_keep/objects/cc/52f7d833c761b3b11a5fa1ae76ba9aba2edd6f deleted file mode 100644 index 0e775a5f8..000000000 --- a/test/integration/branchRebase/expected/repo/.git_keep/objects/cc/52f7d833c761b3b11a5fa1ae76ba9aba2edd6f +++ /dev/null @@ -1,6 +0,0 @@ -xQ -@ DS -,* -FڦBw#)MRdLPw5' d􂎤)aP:;%6 -zs[h/6|ZW}7 -ձ/K(V(+'g,7c01 \ No newline at end of file diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c b/test/integration/branchRebase/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c deleted file mode 100644 index 74c919681..000000000 --- a/test/integration/branchRebase/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/branchRebase/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/branchRebase/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f..000000000 Binary files a/test/integration/branchRebase/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b and /dev/null differ diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e b/test/integration/branchRebase/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e deleted file mode 100644 index 3a7ee91ea..000000000 Binary files a/test/integration/branchRebase/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e and /dev/null differ diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 b/test/integration/branchRebase/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 deleted file mode 100644 index 83998943a..000000000 Binary files a/test/integration/branchRebase/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 and /dev/null differ diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/e9/57aaf2eef0c03a9052b472d4862d9ee684c3e5 b/test/integration/branchRebase/expected/repo/.git_keep/objects/e9/57aaf2eef0c03a9052b472d4862d9ee684c3e5 deleted file mode 100644 index 52090e26c..000000000 Binary files a/test/integration/branchRebase/expected/repo/.git_keep/objects/e9/57aaf2eef0c03a9052b472d4862d9ee684c3e5 and /dev/null differ diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 b/test/integration/branchRebase/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 deleted file mode 100644 index e9f9f0881..000000000 Binary files a/test/integration/branchRebase/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 and /dev/null differ diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/f5/067da83b48f8588edce682fd2715a575f34373 b/test/integration/branchRebase/expected/repo/.git_keep/objects/f5/067da83b48f8588edce682fd2715a575f34373 deleted file mode 100644 index 47681b580..000000000 --- a/test/integration/branchRebase/expected/repo/.git_keep/objects/f5/067da83b48f8588edce682fd2715a575f34373 +++ /dev/null @@ -1,4 +0,0 @@ -xA -0E]$cL -"BW=FP4% x? O2`"t,GQtЈ|XSZbR{5C8b5Eqd -G[Ki4?K,̀ޓ5pFZjˠlû 1A \ No newline at end of file diff --git a/test/integration/branchRebase/expected/repo/.git_keep/objects/fe/427b52bbbe9dac81b463a162f37ab979ca772b b/test/integration/branchRebase/expected/repo/.git_keep/objects/fe/427b52bbbe9dac81b463a162f37ab979ca772b deleted file mode 100644 index 276be8d53..000000000 Binary files a/test/integration/branchRebase/expected/repo/.git_keep/objects/fe/427b52bbbe9dac81b463a162f37ab979ca772b and /dev/null differ diff --git a/test/integration/branchRebase/expected/repo/.git_keep/refs/heads/develop b/test/integration/branchRebase/expected/repo/.git_keep/refs/heads/develop deleted file mode 100644 index d77f4721f..000000000 --- a/test/integration/branchRebase/expected/repo/.git_keep/refs/heads/develop +++ /dev/null @@ -1 +0,0 @@ -e957aaf2eef0c03a9052b472d4862d9ee684c3e5 diff --git a/test/integration/branchRebase/expected/repo/.git_keep/refs/heads/master b/test/integration/branchRebase/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 567f6507a..000000000 --- a/test/integration/branchRebase/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -42597904331c82f6d5c8c902755c8dfa5767ea95 diff --git a/test/integration/branchRebase/expected/repo/directory/file b/test/integration/branchRebase/expected/repo/directory/file deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/branchRebase/expected/repo/directory/file +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/branchRebase/expected/repo/directory/file2 b/test/integration/branchRebase/expected/repo/directory/file2 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/branchRebase/expected/repo/directory/file2 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/branchRebase/expected/repo/file1 b/test/integration/branchRebase/expected/repo/file1 deleted file mode 100644 index 5d874a902..000000000 --- a/test/integration/branchRebase/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 dog diff --git a/test/integration/branchRebase/expected/repo/file3 b/test/integration/branchRebase/expected/repo/file3 deleted file mode 100644 index 1b9ae5f5d..000000000 --- a/test/integration/branchRebase/expected/repo/file3 +++ /dev/null @@ -1 +0,0 @@ -once upon a time there was a mouse diff --git a/test/integration/branchRebase/expected/repo/file4 b/test/integration/branchRebase/expected/repo/file4 deleted file mode 100644 index 1b9ae5f5d..000000000 --- a/test/integration/branchRebase/expected/repo/file4 +++ /dev/null @@ -1 +0,0 @@ -once upon a time there was a mouse diff --git a/test/integration/branchRebase/expected/repo/file5 b/test/integration/branchRebase/expected/repo/file5 deleted file mode 100644 index 1b9ae5f5d..000000000 --- a/test/integration/branchRebase/expected/repo/file5 +++ /dev/null @@ -1 +0,0 @@ -once upon a time there was a mouse diff --git a/test/integration/branchRebase/recording.json b/test/integration/branchRebase/recording.json deleted file mode 100644 index c0da4c16a..000000000 --- a/test/integration/branchRebase/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":617,"Mod":0,"Key":259,"Ch":0},{"Timestamp":922,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1176,"Mod":0,"Key":256,"Ch":114},{"Timestamp":1512,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2797,"Mod":0,"Key":27,"Ch":0},{"Timestamp":3632,"Mod":0,"Key":256,"Ch":114},{"Timestamp":4032,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4760,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5105,"Mod":0,"Key":259,"Ch":0},{"Timestamp":5376,"Mod":0,"Key":259,"Ch":0},{"Timestamp":5721,"Mod":0,"Key":256,"Ch":100},{"Timestamp":5992,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6186,"Mod":0,"Key":256,"Ch":100},{"Timestamp":6401,"Mod":0,"Key":258,"Ch":0},{"Timestamp":6592,"Mod":0,"Key":256,"Ch":100},{"Timestamp":6840,"Mod":0,"Key":260,"Ch":0},{"Timestamp":7105,"Mod":0,"Key":260,"Ch":0},{"Timestamp":7612,"Mod":0,"Key":256,"Ch":32},{"Timestamp":7922,"Mod":0,"Key":258,"Ch":0},{"Timestamp":8160,"Mod":0,"Key":256,"Ch":32},{"Timestamp":8680,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9080,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9464,"Mod":0,"Key":256,"Ch":32},{"Timestamp":9808,"Mod":0,"Key":256,"Ch":32},{"Timestamp":10040,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10372,"Mod":0,"Key":256,"Ch":32},{"Timestamp":11249,"Mod":0,"Key":13,"Ch":13},{"Timestamp":12088,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/branchRebase/setup.sh b/test/integration/branchRebase/setup.sh deleted file mode 100644 index a1f14b455..000000000 --- a/test/integration/branchRebase/setup.sh +++ /dev/null @@ -1,85 +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 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" diff --git a/test/integration/branchRebase/test.json b/test/integration/branchRebase/test.json deleted file mode 100644 index 1082379ed..000000000 --- a/test/integration/branchRebase/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "In this test we fix some merge conflicts, ensuring that in the flat tree structure the conflicts are bubbled to the top, and that after resolving the conflicts your cursor stays on the same line, able to select the next conflicted file. We also switch to tree mode and ensure that works too.", "speed": 10 } diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration_new/branch/rebase/expected/repo/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..14bc77d37 --- /dev/null +++ b/test/integration_new/branch/rebase/expected/repo/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +second-change-branch unrelated change diff --git a/test/integration/branchRebase/expected/repo/.git_keep/FETCH_HEAD b/test/integration_new/branch/rebase/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/branchRebase/expected/repo/.git_keep/FETCH_HEAD rename to test/integration_new/branch/rebase/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/HEAD b/test/integration_new/branch/rebase/expected/repo/.git_keep/HEAD new file mode 100644 index 000000000..e1c7bf8c5 --- /dev/null +++ b/test/integration_new/branch/rebase/expected/repo/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/first-change-branch diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/MERGE_MSG b/test/integration_new/branch/rebase/expected/repo/.git_keep/MERGE_MSG new file mode 100644 index 000000000..803d9a2dd --- /dev/null +++ b/test/integration_new/branch/rebase/expected/repo/.git_keep/MERGE_MSG @@ -0,0 +1,4 @@ +first change + +# Conflicts: +# file diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/ORIG_HEAD b/test/integration_new/branch/rebase/expected/repo/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..51a54aa1d --- /dev/null +++ b/test/integration_new/branch/rebase/expected/repo/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +f42b6ab94e265acf87a9b3bf8cfa1105fcad57b2 diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/REBASE_HEAD b/test/integration_new/branch/rebase/expected/repo/.git_keep/REBASE_HEAD new file mode 100644 index 000000000..51a54aa1d --- /dev/null +++ b/test/integration_new/branch/rebase/expected/repo/.git_keep/REBASE_HEAD @@ -0,0 +1 @@ +f42b6ab94e265acf87a9b3bf8cfa1105fcad57b2 diff --git a/test/integration/branchRebase/expected/repo/.git_keep/config b/test/integration_new/branch/rebase/expected/repo/.git_keep/config similarity index 87% rename from test/integration/branchRebase/expected/repo/.git_keep/config rename to test/integration_new/branch/rebase/expected/repo/.git_keep/config index 8ae104545..8a748ce32 100644 --- a/test/integration/branchRebase/expected/repo/.git_keep/config +++ b/test/integration_new/branch/rebase/expected/repo/.git_keep/config @@ -8,3 +8,5 @@ [user] email = CI@example.com name = CI +[commit] + gpgSign = false diff --git a/test/integration/branchRebase/expected/repo/.git_keep/description b/test/integration_new/branch/rebase/expected/repo/.git_keep/description similarity index 100% rename from test/integration/branchRebase/expected/repo/.git_keep/description rename to test/integration_new/branch/rebase/expected/repo/.git_keep/description diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/index b/test/integration_new/branch/rebase/expected/repo/.git_keep/index new file mode 100644 index 000000000..b5c896cfb Binary files /dev/null and b/test/integration_new/branch/rebase/expected/repo/.git_keep/index differ diff --git a/test/integration/branchRebase/expected/repo/.git_keep/info/exclude b/test/integration_new/branch/rebase/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/branchRebase/expected/repo/.git_keep/info/exclude rename to test/integration_new/branch/rebase/expected/repo/.git_keep/info/exclude diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/HEAD b/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..be5fa6486 --- /dev/null +++ b/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,13 @@ +0000000000000000000000000000000000000000 0227353d56e56df9e9f94559f90b86ce7aa1ca5c CI 1661164934 +1000 commit (initial): one +0227353d56e56df9e9f94559f90b86ce7aa1ca5c d7149d98e6da25303f9a8cdff131da4b0723a412 CI 1661164934 +1000 commit: two +d7149d98e6da25303f9a8cdff131da4b0723a412 4c66ef64d685d244db41efda29deffb381c46c3d CI 1661164934 +1000 commit: three +4c66ef64d685d244db41efda29deffb381c46c3d b827df09781d0648f66cd9a01f0ec0ad5d412e10 CI 1661164934 +1000 commit: original +b827df09781d0648f66cd9a01f0ec0ad5d412e10 b827df09781d0648f66cd9a01f0ec0ad5d412e10 CI 1661164934 +1000 checkout: moving from original-branch to first-change-branch +b827df09781d0648f66cd9a01f0ec0ad5d412e10 f42b6ab94e265acf87a9b3bf8cfa1105fcad57b2 CI 1661164934 +1000 commit: first change +f42b6ab94e265acf87a9b3bf8cfa1105fcad57b2 b827df09781d0648f66cd9a01f0ec0ad5d412e10 CI 1661164934 +1000 checkout: moving from first-change-branch to original-branch +b827df09781d0648f66cd9a01f0ec0ad5d412e10 b827df09781d0648f66cd9a01f0ec0ad5d412e10 CI 1661164934 +1000 checkout: moving from original-branch to second-change-branch +b827df09781d0648f66cd9a01f0ec0ad5d412e10 702b646c08ba47b2ac5729deed77188ef1647b4d CI 1661164934 +1000 commit: second change +702b646c08ba47b2ac5729deed77188ef1647b4d 5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 CI 1661164934 +1000 commit: second-change-branch unrelated change +5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 f42b6ab94e265acf87a9b3bf8cfa1105fcad57b2 CI 1661164934 +1000 checkout: moving from second-change-branch to first-change-branch +f42b6ab94e265acf87a9b3bf8cfa1105fcad57b2 5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 CI 1661164936 +1000 rebase (start): checkout second-change-branch +5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 CI 1661164938 +1000 rebase (continue) (finish): returning to refs/heads/first-change-branch diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/first-change-branch b/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/first-change-branch new file mode 100644 index 000000000..994f744ef --- /dev/null +++ b/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/first-change-branch @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 b827df09781d0648f66cd9a01f0ec0ad5d412e10 CI 1661164934 +1000 branch: Created from HEAD +b827df09781d0648f66cd9a01f0ec0ad5d412e10 f42b6ab94e265acf87a9b3bf8cfa1105fcad57b2 CI 1661164934 +1000 commit: first change +f42b6ab94e265acf87a9b3bf8cfa1105fcad57b2 5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 CI 1661164938 +1000 rebase (continue) (finish): refs/heads/first-change-branch onto 5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/original-branch b/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/original-branch new file mode 100644 index 000000000..0de43eaeb --- /dev/null +++ b/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/original-branch @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 0227353d56e56df9e9f94559f90b86ce7aa1ca5c CI 1661164934 +1000 commit (initial): one +0227353d56e56df9e9f94559f90b86ce7aa1ca5c d7149d98e6da25303f9a8cdff131da4b0723a412 CI 1661164934 +1000 commit: two +d7149d98e6da25303f9a8cdff131da4b0723a412 4c66ef64d685d244db41efda29deffb381c46c3d CI 1661164934 +1000 commit: three +4c66ef64d685d244db41efda29deffb381c46c3d b827df09781d0648f66cd9a01f0ec0ad5d412e10 CI 1661164934 +1000 commit: original diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/second-change-branch b/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/second-change-branch new file mode 100644 index 000000000..b20bc5041 --- /dev/null +++ b/test/integration_new/branch/rebase/expected/repo/.git_keep/logs/refs/heads/second-change-branch @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 b827df09781d0648f66cd9a01f0ec0ad5d412e10 CI 1661164934 +1000 branch: Created from HEAD +b827df09781d0648f66cd9a01f0ec0ad5d412e10 702b646c08ba47b2ac5729deed77188ef1647b4d CI 1661164934 +1000 commit: second change +702b646c08ba47b2ac5729deed77188ef1647b4d 5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 CI 1661164934 +1000 commit: second-change-branch unrelated change diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179 b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179 new file mode 100644 index 000000000..bd9b135ac Binary files /dev/null and b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179 differ diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/02/27353d56e56df9e9f94559f90b86ce7aa1ca5c b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/02/27353d56e56df9e9f94559f90b86ce7aa1ca5c new file mode 100644 index 000000000..d9ada22e6 --- /dev/null +++ b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/02/27353d56e56df9e9f94559f90b86ce7aa1ca5c @@ -0,0 +1,2 @@ +xA +0Fa9!#I`=B^i:S_0S_!4/aCX2ե_Ɖn?L4^n wq+\ \ No newline at end of file diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/11/0d6e0b946c9d9b9b5e44c29d98692e925c368c b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/11/0d6e0b946c9d9b9b5e44c29d98692e925c368c new file mode 100644 index 000000000..a893c2563 Binary files /dev/null and b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/11/0d6e0b946c9d9b9b5e44c29d98692e925c368c differ diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804 b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804 new file mode 100644 index 000000000..3f0746de5 Binary files /dev/null and b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804 differ diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/1f/332f64cb03c06913491af20cd407158776bd55 b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/1f/332f64cb03c06913491af20cd407158776bd55 new file mode 100644 index 000000000..8cded6c81 Binary files /dev/null and b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/1f/332f64cb03c06913491af20cd407158776bd55 differ diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/3a/ac30738b0dda38d964abe6c2386603f9309a65 b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/3a/ac30738b0dda38d964abe6c2386603f9309a65 new file mode 100644 index 000000000..1f72f9aee Binary files /dev/null and b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/3a/ac30738b0dda38d964abe6c2386603f9309a65 differ diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 new file mode 100644 index 000000000..adf64119a Binary files /dev/null and b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 differ diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/4c/16472189d1db34cb67b99439725202216e26d9 b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/4c/16472189d1db34cb67b99439725202216e26d9 new file mode 100644 index 000000000..9d9452bdd Binary files /dev/null and b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/4c/16472189d1db34cb67b99439725202216e26d9 differ diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/4c/66ef64d685d244db41efda29deffb381c46c3d b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/4c/66ef64d685d244db41efda29deffb381c46c3d new file mode 100644 index 000000000..b78879b10 Binary files /dev/null and b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/4c/66ef64d685d244db41efda29deffb381c46c3d differ diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/55/13fcfcb56cc5f1de7b6b3ded32a945e94f5e37 b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/55/13fcfcb56cc5f1de7b6b3ded32a945e94f5e37 new file mode 100644 index 000000000..7179605be Binary files /dev/null and b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/55/13fcfcb56cc5f1de7b6b3ded32a945e94f5e37 differ diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/70/2b646c08ba47b2ac5729deed77188ef1647b4d b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/70/2b646c08ba47b2ac5729deed77188ef1647b4d new file mode 100644 index 000000000..3c54ea1fe --- /dev/null +++ b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/70/2b646c08ba47b2ac5729deed77188ef1647b4d @@ -0,0 +1,2 @@ +xM +0@a9IL"BW=F~&V0M<=ǷxO}DٕQ]2GW8! W[e\гWM$ y̆Ka:wZYKd Q.r i C9`< \ No newline at end of file diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/ab/1329d5c536f369c741c65fab7cca4ab27dc22e b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/ab/1329d5c536f369c741c65fab7cca4ab27dc22e new file mode 100644 index 000000000..4c6a50757 Binary files /dev/null and b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/ab/1329d5c536f369c741c65fab7cca4ab27dc22e differ diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/b8/27df09781d0648f66cd9a01f0ec0ad5d412e10 b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/b8/27df09781d0648f66cd9a01f0ec0ad5d412e10 new file mode 100644 index 000000000..b59c8608a Binary files /dev/null and b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/b8/27df09781d0648f66cd9a01f0ec0ad5d412e10 differ diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/d7/149d98e6da25303f9a8cdff131da4b0723a412 b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/d7/149d98e6da25303f9a8cdff131da4b0723a412 new file mode 100644 index 000000000..9fcee8fcd Binary files /dev/null and b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/d7/149d98e6da25303f9a8cdff131da4b0723a412 differ diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/f4/2b6ab94e265acf87a9b3bf8cfa1105fcad57b2 b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/f4/2b6ab94e265acf87a9b3bf8cfa1105fcad57b2 new file mode 100644 index 000000000..b625df309 Binary files /dev/null and b/test/integration_new/branch/rebase/expected/repo/.git_keep/objects/f4/2b6ab94e265acf87a9b3bf8cfa1105fcad57b2 differ diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/first-change-branch b/test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/first-change-branch new file mode 100644 index 000000000..4867226ea --- /dev/null +++ b/test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/first-change-branch @@ -0,0 +1 @@ +5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/original-branch b/test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/original-branch new file mode 100644 index 000000000..8b9bdc87a --- /dev/null +++ b/test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/original-branch @@ -0,0 +1 @@ +b827df09781d0648f66cd9a01f0ec0ad5d412e10 diff --git a/test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/second-change-branch b/test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/second-change-branch new file mode 100644 index 000000000..4867226ea --- /dev/null +++ b/test/integration_new/branch/rebase/expected/repo/.git_keep/refs/heads/second-change-branch @@ -0,0 +1 @@ +5513fcfcb56cc5f1de7b6b3ded32a945e94f5e37 diff --git a/test/integration_new/branch/rebase/expected/repo/file b/test/integration_new/branch/rebase/expected/repo/file new file mode 100644 index 000000000..164a07af1 --- /dev/null +++ b/test/integration_new/branch/rebase/expected/repo/file @@ -0,0 +1,6 @@ + +This +Is +The +Second Change +File diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..e2e92c427 --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +to keep diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/FETCH_HEAD b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/FETCH_HEAD new file mode 100644 index 000000000..e69de29bb diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/HEAD b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/HEAD new file mode 100644 index 000000000..e1c7bf8c5 --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/first-change-branch diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/ORIG_HEAD b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..27e5d1433 --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +39129f24587bdc648e1fdb6f0b089c0846f54d45 diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/config b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/config new file mode 100644 index 000000000..8a748ce32 --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/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/branch/rebase_and_drop/expected/repo/.git_keep/description b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/index b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/index new file mode 100644 index 000000000..44eb0c68b Binary files /dev/null and b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/index differ diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/info/exclude b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/info/exclude new file mode 100644 index 000000000..8e9f2071f --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/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/branch/rebase_and_drop/expected/repo/.git_keep/logs/HEAD b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..a0a6f7fe5 --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,16 @@ +0000000000000000000000000000000000000000 ab5816052b05d45683d9fd3aa85203995b66cd65 CI 1661165903 +1000 commit (initial): one +ab5816052b05d45683d9fd3aa85203995b66cd65 9d068e4adf5b237e3f3abe9ce38cfd996cce75dc CI 1661165903 +1000 commit: two +9d068e4adf5b237e3f3abe9ce38cfd996cce75dc 7c0af051757503c84800076fd34851ea8b81e415 CI 1661165903 +1000 commit: three +7c0af051757503c84800076fd34851ea8b81e415 c066f8c513a34cd0c63e54c3b418a50491686cff CI 1661165904 +1000 commit: original +c066f8c513a34cd0c63e54c3b418a50491686cff c066f8c513a34cd0c63e54c3b418a50491686cff CI 1661165904 +1000 checkout: moving from original-branch to first-change-branch +c066f8c513a34cd0c63e54c3b418a50491686cff 5587edfe46cfc076fb9ff4db76d196965838669a CI 1661165904 +1000 commit: first change +5587edfe46cfc076fb9ff4db76d196965838669a c066f8c513a34cd0c63e54c3b418a50491686cff CI 1661165904 +1000 checkout: moving from first-change-branch to original-branch +c066f8c513a34cd0c63e54c3b418a50491686cff c066f8c513a34cd0c63e54c3b418a50491686cff CI 1661165904 +1000 checkout: moving from original-branch to second-change-branch +c066f8c513a34cd0c63e54c3b418a50491686cff 3fc37a0e51435e01769aa25e6fe7179add2642a6 CI 1661165904 +1000 commit: second change +3fc37a0e51435e01769aa25e6fe7179add2642a6 3228c73cfc742264f3101966a81d6a0a70488e36 CI 1661165904 +1000 commit: second-change-branch unrelated change +3228c73cfc742264f3101966a81d6a0a70488e36 5587edfe46cfc076fb9ff4db76d196965838669a CI 1661165904 +1000 checkout: moving from second-change-branch to first-change-branch +5587edfe46cfc076fb9ff4db76d196965838669a b56a14235fe8b10e5cca38d8b8009899d60b6499 CI 1661165904 +1000 commit: to drop +b56a14235fe8b10e5cca38d8b8009899d60b6499 39129f24587bdc648e1fdb6f0b089c0846f54d45 CI 1661165904 +1000 commit: to keep +39129f24587bdc648e1fdb6f0b089c0846f54d45 3228c73cfc742264f3101966a81d6a0a70488e36 CI 1661165905 +1000 rebase (start): checkout second-change-branch +3228c73cfc742264f3101966a81d6a0a70488e36 99a7ae4f26f9e76d96e97a8acd47bf9f22dcea12 CI 1661165908 +1000 rebase (continue) (pick): to keep +99a7ae4f26f9e76d96e97a8acd47bf9f22dcea12 99a7ae4f26f9e76d96e97a8acd47bf9f22dcea12 CI 1661165908 +1000 rebase (continue) (finish): returning to refs/heads/first-change-branch diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/first-change-branch b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/first-change-branch new file mode 100644 index 000000000..46db32f0e --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/first-change-branch @@ -0,0 +1,5 @@ +0000000000000000000000000000000000000000 c066f8c513a34cd0c63e54c3b418a50491686cff CI 1661165904 +1000 branch: Created from HEAD +c066f8c513a34cd0c63e54c3b418a50491686cff 5587edfe46cfc076fb9ff4db76d196965838669a CI 1661165904 +1000 commit: first change +5587edfe46cfc076fb9ff4db76d196965838669a b56a14235fe8b10e5cca38d8b8009899d60b6499 CI 1661165904 +1000 commit: to drop +b56a14235fe8b10e5cca38d8b8009899d60b6499 39129f24587bdc648e1fdb6f0b089c0846f54d45 CI 1661165904 +1000 commit: to keep +39129f24587bdc648e1fdb6f0b089c0846f54d45 99a7ae4f26f9e76d96e97a8acd47bf9f22dcea12 CI 1661165908 +1000 rebase (continue) (finish): refs/heads/first-change-branch onto 3228c73cfc742264f3101966a81d6a0a70488e36 diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/original-branch b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/original-branch new file mode 100644 index 000000000..5999618a9 --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/original-branch @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 ab5816052b05d45683d9fd3aa85203995b66cd65 CI 1661165903 +1000 commit (initial): one +ab5816052b05d45683d9fd3aa85203995b66cd65 9d068e4adf5b237e3f3abe9ce38cfd996cce75dc CI 1661165903 +1000 commit: two +9d068e4adf5b237e3f3abe9ce38cfd996cce75dc 7c0af051757503c84800076fd34851ea8b81e415 CI 1661165903 +1000 commit: three +7c0af051757503c84800076fd34851ea8b81e415 c066f8c513a34cd0c63e54c3b418a50491686cff CI 1661165904 +1000 commit: original diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/second-change-branch b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/second-change-branch new file mode 100644 index 000000000..e0b0742a8 --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/logs/refs/heads/second-change-branch @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 c066f8c513a34cd0c63e54c3b418a50491686cff CI 1661165904 +1000 branch: Created from HEAD +c066f8c513a34cd0c63e54c3b418a50491686cff 3fc37a0e51435e01769aa25e6fe7179add2642a6 CI 1661165904 +1000 commit: second change +3fc37a0e51435e01769aa25e6fe7179add2642a6 3228c73cfc742264f3101966a81d6a0a70488e36 CI 1661165904 +1000 commit: second-change-branch unrelated change diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179 b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179 new file mode 100644 index 000000000..bd9b135ac Binary files /dev/null and b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/00/7e2d78fa770b29f98fe68d06bb58f7bb3a0179 differ diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/11/0d6e0b946c9d9b9b5e44c29d98692e925c368c b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/11/0d6e0b946c9d9b9b5e44c29d98692e925c368c new file mode 100644 index 000000000..a893c2563 Binary files /dev/null and b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/11/0d6e0b946c9d9b9b5e44c29d98692e925c368c differ diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804 b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804 new file mode 100644 index 000000000..3f0746de5 Binary files /dev/null and b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/16/4a07af15e8fe5be0c5c962ddb80bfcca8fd804 differ diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/1f/332f64cb03c06913491af20cd407158776bd55 b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/1f/332f64cb03c06913491af20cd407158776bd55 new file mode 100644 index 000000000..8cded6c81 Binary files /dev/null and b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/1f/332f64cb03c06913491af20cd407158776bd55 differ diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/32/28c73cfc742264f3101966a81d6a0a70488e36 b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/32/28c73cfc742264f3101966a81d6a0a70488e36 new file mode 100644 index 000000000..04f11b074 Binary files /dev/null and b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/32/28c73cfc742264f3101966a81d6a0a70488e36 differ diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/39/129f24587bdc648e1fdb6f0b089c0846f54d45 b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/39/129f24587bdc648e1fdb6f0b089c0846f54d45 new file mode 100644 index 000000000..9b16182c2 --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/39/129f24587bdc648e1fdb6f0b089c0846f54d45 @@ -0,0 +1,2 @@ +xM +1 @a=E$6ӀjџEkw-^=TSeڌ,dPp&Sެq9 %(A0&v"&~ƽop[|[m})vb&b/HhO ᩺.|9 \ No newline at end of file diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/3a/ac30738b0dda38d964abe6c2386603f9309a65 b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/3a/ac30738b0dda38d964abe6c2386603f9309a65 new file mode 100644 index 000000000..1f72f9aee Binary files /dev/null and b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/3a/ac30738b0dda38d964abe6c2386603f9309a65 differ diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/3f/c37a0e51435e01769aa25e6fe7179add2642a6 b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/3f/c37a0e51435e01769aa25e6fe7179add2642a6 new file mode 100644 index 000000000..91a3f5930 Binary files /dev/null and b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/3f/c37a0e51435e01769aa25e6fe7179add2642a6 differ diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 new file mode 100644 index 000000000..adf64119a Binary files /dev/null and b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 differ diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/4c/16472189d1db34cb67b99439725202216e26d9 b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/4c/16472189d1db34cb67b99439725202216e26d9 new file mode 100644 index 000000000..9d9452bdd Binary files /dev/null and b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/4c/16472189d1db34cb67b99439725202216e26d9 differ diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/55/87edfe46cfc076fb9ff4db76d196965838669a b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/55/87edfe46cfc076fb9ff4db76d196965838669a new file mode 100644 index 000000000..b4c454a68 --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/55/87edfe46cfc076fb9ff4db76d196965838669a @@ -0,0 +1,2 @@ +xK +0@] 2I ]tb!Fn}]bZT-f. H#r2;чiVms8H L0$-I]i=^z}YdFd3iMUS7YmeICa;: \ No newline at end of file diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/7b/e86fe92edea93469924da2c241943adddd27cc b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/7b/e86fe92edea93469924da2c241943adddd27cc new file mode 100644 index 000000000..125e024fa Binary files /dev/null and b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/7b/e86fe92edea93469924da2c241943adddd27cc differ diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/7c/0af051757503c84800076fd34851ea8b81e415 b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/7c/0af051757503c84800076fd34851ea8b81e415 new file mode 100644 index 000000000..4b6d35f7f Binary files /dev/null and b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/7c/0af051757503c84800076fd34851ea8b81e415 differ diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/99/a7ae4f26f9e76d96e97a8acd47bf9f22dcea12 b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/99/a7ae4f26f9e76d96e97a8acd47bf9f22dcea12 new file mode 100644 index 000000000..a95baa626 Binary files /dev/null and b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/99/a7ae4f26f9e76d96e97a8acd47bf9f22dcea12 differ diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/9d/068e4adf5b237e3f3abe9ce38cfd996cce75dc b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/9d/068e4adf5b237e3f3abe9ce38cfd996cce75dc new file mode 100644 index 000000000..1e6785cfe Binary files /dev/null and b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/9d/068e4adf5b237e3f3abe9ce38cfd996cce75dc differ diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/ab/5816052b05d45683d9fd3aa85203995b66cd65 b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/ab/5816052b05d45683d9fd3aa85203995b66cd65 new file mode 100644 index 000000000..00050c536 Binary files /dev/null and b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/ab/5816052b05d45683d9fd3aa85203995b66cd65 differ diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/b5/6a14235fe8b10e5cca38d8b8009899d60b6499 b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/b5/6a14235fe8b10e5cca38d8b8009899d60b6499 new file mode 100644 index 000000000..11da58d50 Binary files /dev/null and b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/b5/6a14235fe8b10e5cca38d8b8009899d60b6499 differ diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/c0/66f8c513a34cd0c63e54c3b418a50491686cff b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/c0/66f8c513a34cd0c63e54c3b418a50491686cff new file mode 100644 index 000000000..750122d3f Binary files /dev/null and b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/objects/c0/66f8c513a34cd0c63e54c3b418a50491686cff differ diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/first-change-branch b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/first-change-branch new file mode 100644 index 000000000..c61dc9511 --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/first-change-branch @@ -0,0 +1 @@ +99a7ae4f26f9e76d96e97a8acd47bf9f22dcea12 diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/original-branch b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/original-branch new file mode 100644 index 000000000..383cec079 --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/original-branch @@ -0,0 +1 @@ +c066f8c513a34cd0c63e54c3b418a50491686cff diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/second-change-branch b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/second-change-branch new file mode 100644 index 000000000..de415434a --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/expected/repo/.git_keep/refs/heads/second-change-branch @@ -0,0 +1 @@ +3228c73cfc742264f3101966a81d6a0a70488e36 diff --git a/test/integration_new/branch/rebase_and_drop/expected/repo/file b/test/integration_new/branch/rebase_and_drop/expected/repo/file new file mode 100644 index 000000000..164a07af1 --- /dev/null +++ b/test/integration_new/branch/rebase_and_drop/expected/repo/file @@ -0,0 +1,6 @@ + +This +Is +The +Second Change +File