From b13cfdfea068919ed120c454368c3ce18b21eda9 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Mon, 19 Dec 2022 22:38:32 +1100 Subject: [PATCH] migrate branch reset integration test --- pkg/integration/tests/branch/reset.go | 54 +++++++++++ pkg/integration/tests/tests.go | 1 + .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../branchReset/expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/ORIG_HEAD | 1 - .../branchReset/expected/repo/.git_keep/index | Bin 547 -> 0 bytes .../expected/repo/.git_keep/logs/HEAD | 18 ---- .../repo/.git_keep/logs/refs/heads/develop | 5 -- .../repo/.git_keep/logs/refs/heads/master | 6 -- .../09/cbe8c6717c06a61876b7b641a46a62bf3c585d | Bin 112 -> 0 bytes .../10/6606554f129e8b6e4b942908734deef5628dcd | 3 - .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../1b/9ae5f5dff631baaa180a30afd9983f83dc27ca | Bin 50 -> 0 bytes .../21/78af7503938665881174069be4d48fa483e4af | Bin 117 -> 0 bytes .../27/ba706fa463253f9189b2f258430877d2b5ed4f | 2 - .../34/c74161eef968fc951cf170a011fa8abfeddbcd | Bin 120 -> 0 bytes .../37/14b55ba17f3d8b0233c6e5924a5e497eb09bb7 | Bin 121 -> 0 bytes .../4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 | 1 - .../5f/3e4598b46a912f0f95a4898743e979343c82f3 | Bin 86 -> 0 bytes .../60/91d709b275e712111d016d9b3a4fb44e63f1f6 | Bin 54 -> 0 bytes .../7a/45b8933308e43f2597ee5d290862a62a9b46b3 | Bin 111 -> 0 bytes .../7c/d86f0c3e1894b4270d0bf9fa246c33568f9bf1 | 3 - .../88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 | Bin 65 -> 0 bytes .../8b/24e74245461f6ad529c77c040fe17e415cf3da | Bin 159 -> 0 bytes .../8c/7a45270a95d66c8e3b843df3f466be5dc19960 | Bin 117 -> 0 bytes .../9d/e8260b738a34a74533df54f2e404276aa96242 | Bin 54 -> 0 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../a7/3e01f9d181ff16b3d821dd962e98accbd62936 | Bin 157 -> 0 bytes .../bd/8db1919bbbbd4509ad4d9fa3baf546460e17a2 | Bin 157 -> 0 bytes .../c2/3c3e0496a9b3decc42344bfd94514f0834b93c | Bin 157 -> 0 bytes .../cb/289e645aed5251ce74fa2eaf0cd1145b9cb014 | Bin 120 -> 0 bytes .../dc/d348507ba1da8f6479b9d964daa302b2fb9d9c | 1 - .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../e3/ae5c6d8407e8307b9bc77923be78c901408f6e | Bin 50 -> 0 bytes .../e4/666ba294866d5c16f9afebcacf8f4adfee7439 | Bin 86 -> 0 bytes .../ee/a0cf47f42fe8d027b4cecaf534ecc0673f7981 | 6 -- .../f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 | Bin 54 -> 0 bytes .../fe/427b52bbbe9dac81b463a162f37ab979ca772b | Bin 85 -> 0 bytes .../repo/.git_keep/refs/heads/develop | 1 - .../expected/repo/.git_keep/refs/heads/master | 1 - .../branchReset/expected/repo/directory/file | 1 - .../branchReset/expected/repo/directory/file2 | 1 - .../branchReset/expected/repo/file1 | 63 ------------- .../branchReset/expected/repo/file3 | 1 - .../branchReset/expected/repo/file4 | 1 - .../branchReset/expected/repo/file5 | 1 - test/integration/branchReset/recording.json | 1 - test/integration/branchReset/setup.sh | 85 ------------------ test/integration/branchReset/test.json | 1 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 + .../reset}/expected/repo/.git_keep/FETCH_HEAD | 0 .../branch/reset/expected/repo/.git_keep/HEAD | 1 + .../reset/expected/repo/.git_keep/ORIG_HEAD | 1 + .../reset}/expected/repo/.git_keep/config | 4 + .../expected/repo/.git_keep/description | 0 .../reset/expected/repo/.git_keep/index | Bin 0 -> 65 bytes .../expected/repo/.git_keep/info/exclude | 0 .../reset/expected/repo/.git_keep/logs/HEAD | 6 ++ .../.git_keep/logs/refs/heads/current-branch | 3 + .../.git_keep/logs/refs/heads/other-branch | 2 + .../0e/9962fc70276ff33de86f77f20ed4482273711a | Bin 0 -> 155 bytes .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 0 -> 15 bytes .../ba/d42488b30daac9e329ccb76a758d78c484a463 | Bin 0 -> 156 bytes .../bc/64902742511e6be6e8d4f6aa90f113ab03f232 | Bin 0 -> 120 bytes .../repo/.git_keep/refs/heads/current-branch | 1 + .../repo/.git_keep/refs/heads/other-branch | 1 + 66 files changed, 75 insertions(+), 205 deletions(-) create mode 100644 pkg/integration/tests/branch/reset.go delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/ORIG_HEAD delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/index delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/logs/refs/heads/develop delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/objects/10/6606554f129e8b6e4b942908734deef5628dcd delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/objects/27/ba706fa463253f9189b2f258430877d2b5ed4f delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/objects/37/14b55ba17f3d8b0233c6e5924a5e497eb09bb7 delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/objects/7a/45b8933308e43f2597ee5d290862a62a9b46b3 delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/objects/7c/d86f0c3e1894b4270d0bf9fa246c33568f9bf1 delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/objects/8b/24e74245461f6ad529c77c040fe17e415cf3da delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/objects/8c/7a45270a95d66c8e3b843df3f466be5dc19960 delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/objects/a7/3e01f9d181ff16b3d821dd962e98accbd62936 delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/objects/bd/8db1919bbbbd4509ad4d9fa3baf546460e17a2 delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/objects/c2/3c3e0496a9b3decc42344bfd94514f0834b93c delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/objects/cb/289e645aed5251ce74fa2eaf0cd1145b9cb014 delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/objects/ee/a0cf47f42fe8d027b4cecaf534ecc0673f7981 delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/objects/fe/427b52bbbe9dac81b463a162f37ab979ca772b delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/refs/heads/develop delete mode 100644 test/integration/branchReset/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/branchReset/expected/repo/directory/file delete mode 100644 test/integration/branchReset/expected/repo/directory/file2 delete mode 100644 test/integration/branchReset/expected/repo/file1 delete mode 100644 test/integration/branchReset/expected/repo/file3 delete mode 100644 test/integration/branchReset/expected/repo/file4 delete mode 100644 test/integration/branchReset/expected/repo/file5 delete mode 100644 test/integration/branchReset/recording.json delete mode 100644 test/integration/branchReset/setup.sh delete mode 100644 test/integration/branchReset/test.json create mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/COMMIT_EDITMSG rename test/{integration/branchReset => integration_new/branch/reset}/expected/repo/.git_keep/FETCH_HEAD (100%) create mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/HEAD create mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/ORIG_HEAD rename test/{integration/branchReset => integration_new/branch/reset}/expected/repo/.git_keep/config (74%) rename test/{integration/branchReset => integration_new/branch/reset}/expected/repo/.git_keep/description (100%) create mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/index rename test/{integration/branchReset => integration_new/branch/reset}/expected/repo/.git_keep/info/exclude (100%) create mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/logs/HEAD create mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/logs/refs/heads/current-branch create mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/logs/refs/heads/other-branch create mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/objects/0e/9962fc70276ff33de86f77f20ed4482273711a create mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 create mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/objects/ba/d42488b30daac9e329ccb76a758d78c484a463 create mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/objects/bc/64902742511e6be6e8d4f6aa90f113ab03f232 create mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/refs/heads/current-branch create mode 100644 test/integration_new/branch/reset/expected/repo/.git_keep/refs/heads/other-branch diff --git a/pkg/integration/tests/branch/reset.go b/pkg/integration/tests/branch/reset.go new file mode 100644 index 000000000..344c1b821 --- /dev/null +++ b/pkg/integration/tests/branch/reset.go @@ -0,0 +1,54 @@ +package branch + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var Reset = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Hard reset to another branch", + ExtraCmdArgs: "", + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + shell.NewBranch("current-branch") + shell.EmptyCommit("root commit") + + shell.NewBranch("other-branch") + shell.EmptyCommit("other-branch commit") + + shell.Checkout("current-branch") + shell.EmptyCommit("current-branch commit") + }, + Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) { + input.SwitchToBranchesWindow() + assert.CurrentViewName("localBranches") + + assert.MatchSelectedLine(Contains("current-branch")) + input.NextItem() + assert.MatchSelectedLine(Contains("other-branch")) + + input.PressKeys(keys.Commits.ViewResetOptions) + assert.InMenu() + assert.MatchCurrentViewTitle(Contains("reset to other-branch")) + + assert.MatchSelectedLine(Contains("soft reset")) + input.NextItem() + assert.MatchSelectedLine(Contains("mixed reset")) + input.NextItem() + assert.MatchSelectedLine(Contains("hard reset")) + + input.Confirm() + + // ensure that we've returned from the menu before continuing + assert.CurrentViewName("localBranches") + + // assert that we now have the expected commits in the commit panel + input.SwitchToCommitsWindow() + assert.CurrentViewName("commits") + assert.CommitCount(2) + assert.MatchSelectedLine(Contains("other-branch commit")) + input.NextItem() + assert.MatchSelectedLine(Contains("root commit")) + }, +}) diff --git a/pkg/integration/tests/tests.go b/pkg/integration/tests/tests.go index 6c4f60026..9e48ed0fc 100644 --- a/pkg/integration/tests/tests.go +++ b/pkg/integration/tests/tests.go @@ -32,6 +32,7 @@ var tests = []*components.IntegrationTest{ branch.Rebase, branch.RebaseAndDrop, branch.Suggestions, + branch.Reset, cherry_pick.CherryPick, cherry_pick.CherryPickConflicts, commit.Commit, diff --git a/test/integration/branchReset/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/branchReset/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 7156ee2dc..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -fourth commit on master diff --git a/test/integration/branchReset/expected/repo/.git_keep/HEAD b/test/integration/branchReset/expected/repo/.git_keep/HEAD deleted file mode 100644 index cb089cd89..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/test/integration/branchReset/expected/repo/.git_keep/ORIG_HEAD b/test/integration/branchReset/expected/repo/.git_keep/ORIG_HEAD deleted file mode 100644 index f6edb547f..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/ORIG_HEAD +++ /dev/null @@ -1 +0,0 @@ -7cd86f0c3e1894b4270d0bf9fa246c33568f9bf1 diff --git a/test/integration/branchReset/expected/repo/.git_keep/index b/test/integration/branchReset/expected/repo/.git_keep/index deleted file mode 100644 index 7128740a2499c7568ae40e254d29ffd652e11033..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 547 zcmZ?q402{*U|<4bwuI~tS2glO!(lWd0|N`2-o*$8hQ=if42)laYD7TlBzS%pH7M;n z_j1*u@T&fnSK9L})EW3vGK*4^OY(~<_0uwQQi19iz~+?L_Q7bVd67h!$B$~B5zM>_ zm#<*+fHc&+C{*(pbNn0L@KkfYdmX{cBRQp{{DAg}9#sZbkgE(q&VsnB`i27793Txf zCmPip24(44Pru&(X1HsW1ed}3n=|a2@2H=Gm}87Er#@r~*c>1YH7AC6b4(ECG~G=F zn**ew=EM?jjw#rjkRVrAAj6u$Ou>-rw8p%YsJB6Z=SqI*t>?KY5w2s}s`j1&yG u=DtwlF77f}?rMBL 1617686737 +1000 commit (initial): first commit -3714b55ba17f3d8b0233c6e5924a5e497eb09bb7 3714b55ba17f3d8b0233c6e5924a5e497eb09bb7 CI 1617686737 +1000 checkout: moving from master to develop -3714b55ba17f3d8b0233c6e5924a5e497eb09bb7 c23c3e0496a9b3decc42344bfd94514f0834b93c CI 1617686737 +1000 commit: first commit on develop -c23c3e0496a9b3decc42344bfd94514f0834b93c 3714b55ba17f3d8b0233c6e5924a5e497eb09bb7 CI 1617686737 +1000 checkout: moving from develop to master -3714b55ba17f3d8b0233c6e5924a5e497eb09bb7 bd8db1919bbbbd4509ad4d9fa3baf546460e17a2 CI 1617686737 +1000 commit: first commit on master -bd8db1919bbbbd4509ad4d9fa3baf546460e17a2 c23c3e0496a9b3decc42344bfd94514f0834b93c CI 1617686737 +1000 checkout: moving from master to develop -c23c3e0496a9b3decc42344bfd94514f0834b93c 8b24e74245461f6ad529c77c040fe17e415cf3da CI 1617686737 +1000 commit: second commit on develop -8b24e74245461f6ad529c77c040fe17e415cf3da bd8db1919bbbbd4509ad4d9fa3baf546460e17a2 CI 1617686737 +1000 checkout: moving from develop to master -bd8db1919bbbbd4509ad4d9fa3baf546460e17a2 106606554f129e8b6e4b942908734deef5628dcd CI 1617686737 +1000 commit: second commit on master -106606554f129e8b6e4b942908734deef5628dcd 8b24e74245461f6ad529c77c040fe17e415cf3da CI 1617686737 +1000 checkout: moving from master to develop -8b24e74245461f6ad529c77c040fe17e415cf3da eea0cf47f42fe8d027b4cecaf534ecc0673f7981 CI 1617686737 +1000 commit: third commit on develop -eea0cf47f42fe8d027b4cecaf534ecc0673f7981 106606554f129e8b6e4b942908734deef5628dcd CI 1617686737 +1000 checkout: moving from develop to master -106606554f129e8b6e4b942908734deef5628dcd a73e01f9d181ff16b3d821dd962e98accbd62936 CI 1617686737 +1000 commit: third commit on master -a73e01f9d181ff16b3d821dd962e98accbd62936 eea0cf47f42fe8d027b4cecaf534ecc0673f7981 CI 1617686737 +1000 checkout: moving from master to develop -eea0cf47f42fe8d027b4cecaf534ecc0673f7981 27ba706fa463253f9189b2f258430877d2b5ed4f CI 1617686737 +1000 commit: fourth commit on develop -27ba706fa463253f9189b2f258430877d2b5ed4f a73e01f9d181ff16b3d821dd962e98accbd62936 CI 1617686737 +1000 checkout: moving from develop to master -a73e01f9d181ff16b3d821dd962e98accbd62936 7cd86f0c3e1894b4270d0bf9fa246c33568f9bf1 CI 1617686737 +1000 commit: fourth commit on master -7cd86f0c3e1894b4270d0bf9fa246c33568f9bf1 27ba706fa463253f9189b2f258430877d2b5ed4f CI 1617686741 +1000 reset: moving to develop diff --git a/test/integration/branchReset/expected/repo/.git_keep/logs/refs/heads/develop b/test/integration/branchReset/expected/repo/.git_keep/logs/refs/heads/develop deleted file mode 100644 index 911311dc4..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/logs/refs/heads/develop +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 3714b55ba17f3d8b0233c6e5924a5e497eb09bb7 CI 1617686737 +1000 branch: Created from HEAD -3714b55ba17f3d8b0233c6e5924a5e497eb09bb7 c23c3e0496a9b3decc42344bfd94514f0834b93c CI 1617686737 +1000 commit: first commit on develop -c23c3e0496a9b3decc42344bfd94514f0834b93c 8b24e74245461f6ad529c77c040fe17e415cf3da CI 1617686737 +1000 commit: second commit on develop -8b24e74245461f6ad529c77c040fe17e415cf3da eea0cf47f42fe8d027b4cecaf534ecc0673f7981 CI 1617686737 +1000 commit: third commit on develop -eea0cf47f42fe8d027b4cecaf534ecc0673f7981 27ba706fa463253f9189b2f258430877d2b5ed4f CI 1617686737 +1000 commit: fourth commit on develop diff --git a/test/integration/branchReset/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/branchReset/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 0f20bf8e9..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,6 +0,0 @@ -0000000000000000000000000000000000000000 3714b55ba17f3d8b0233c6e5924a5e497eb09bb7 CI 1617686737 +1000 commit (initial): first commit -3714b55ba17f3d8b0233c6e5924a5e497eb09bb7 bd8db1919bbbbd4509ad4d9fa3baf546460e17a2 CI 1617686737 +1000 commit: first commit on master -bd8db1919bbbbd4509ad4d9fa3baf546460e17a2 106606554f129e8b6e4b942908734deef5628dcd CI 1617686737 +1000 commit: second commit on master -106606554f129e8b6e4b942908734deef5628dcd a73e01f9d181ff16b3d821dd962e98accbd62936 CI 1617686737 +1000 commit: third commit on master -a73e01f9d181ff16b3d821dd962e98accbd62936 7cd86f0c3e1894b4270d0bf9fa246c33568f9bf1 CI 1617686737 +1000 commit: fourth commit on master -7cd86f0c3e1894b4270d0bf9fa246c33568f9bf1 27ba706fa463253f9189b2f258430877d2b5ed4f CI 1617686741 +1000 reset: moving to develop diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d b/test/integration/branchReset/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d deleted file mode 100644 index 8d42c4c9e2f8c317030a30193aef9945f0c8afa2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 112 zcmV-$0FVE80V^p=O;s>7Fk&z<00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R6~Y4mpuZi7vAbmsoZ%p<PK~iAM@OWKJZVUShgX-DG SE0y;F6gC_H diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/10/6606554f129e8b6e4b942908734deef5628dcd b/test/integration/branchReset/expected/repo/.git_keep/objects/10/6606554f129e8b6e4b942908734deef5628dcd deleted file mode 100644 index 1b374995a..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/objects/10/6606554f129e8b6e4b942908734deef5628dcd +++ /dev/null @@ -1,3 +0,0 @@ -xA -0E]$&DzI2E4 xރj)SE@'r&&􎢋dMC\dj]11`=X8#/֐!-xPn4uᲽj:FgZSM!~ -V_@ \ No newline at end of file diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/branchReset/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335bbc5999ad0faff94fb04165d8ab5c7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb~ZE#08nZNMgRZ+ diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca b/test/integration/branchReset/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca deleted file mode 100644 index 2b02dc3d14b4aef3343737214a03a09457e21e38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmb7nZts^PE0#`Wacbg|_{j0{$> Gd}ROuKoaKw diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af b/test/integration/branchReset/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af deleted file mode 100644 index 27c11bb26067e0a43b68d14777da3f61ddfcceac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 117 zcmV-*0E+*30V^p=O;s>7Hf1m|00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R6~Y4mpuZi7vAbmsoZ%p<PK~iAM@OWKJZVUShgX-DG XE0yi+kh=VyFxv@AV diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/27/ba706fa463253f9189b2f258430877d2b5ed4f b/test/integration/branchReset/expected/repo/.git_keep/objects/27/ba706fa463253f9189b2f258430877d2b5ed4f deleted file mode 100644 index 892cab8e4..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/objects/27/ba706fa463253f9189b2f258430877d2b5ed4f +++ /dev/null @@ -1,2 +0,0 @@ -xM -0)޾Pb~J) ԈWf`,˫a M[q,6G$fNFVmqZ Z ٚ6iF+]c!}hrZVS٩O|͸IYĞoO3ЕTşDJ oeS_ɨB) \ No newline at end of file diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd b/test/integration/branchReset/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd deleted file mode 100644 index e8d63bced5a790cf612ba77d98cf03e888d91233..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 120 zcmV-;0Ehp00V^p=O;s>7vtTeW00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R6~Y4mpuZi7vAbmsoZ%p<PK~iAM@OWKJZVUShgX-DG aE0y*LQj3hHr>U7Are>c`4;?u*I|Y!t=7!| zM?6>;0SQF3@HvM>w2lQyGpj6xizW@csz?k&cKo(`>oCo5ndX~(xIQ0pDy?1t2_q$n bLxdxG@7+%KiOHY3)2+V@ewF(IdF?OF)+aTw diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 b/test/integration/branchReset/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 deleted file mode 100644 index e0670d284..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 +++ /dev/null @@ -1 +0,0 @@ -x 0CvL\jVОW=M>!qSWM){Gv*R&)<{QyJ)WK{KdP@mMc1dXQ7zE s5kmt5GZPbqw9K4TLxww-Jp!s1-s(@O+<7zQ)?%hjzvs>Y05^djO6CqI%>V!Z diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 b/test/integration/branchReset/expected/repo/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 deleted file mode 100644 index bfb5376c67ba79deb64b9463958ebd99b0ed9f64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmV-60LlM&0V^p=O;s>6WiT`_Ff%bxNXyJgWmvlB@n6-{8($(qqj>V2E(CbBbYDf1 MH^Qm_0Pdw7o*~;6`~Uy| diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/7a/45b8933308e43f2597ee5d290862a62a9b46b3 b/test/integration/branchReset/expected/repo/.git_keep/objects/7a/45b8933308e43f2597ee5d290862a62a9b46b3 deleted file mode 100644 index f6a9427bc10feda765a6bce02de0a2d2eb0977d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 111 zcmV-#0FeK90V^p=O;s>7Fk&z<00M=S%%arflKi4dhPf})xQn|?mb)6?5BcR%@`{q09rvP{yDhp2XHkSYZ diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/7c/d86f0c3e1894b4270d0bf9fa246c33568f9bf1 b/test/integration/branchReset/expected/repo/.git_keep/objects/7c/d86f0c3e1894b4270d0bf9fa246c33568f9bf1 deleted file mode 100644 index 28f456f97..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/objects/7c/d86f0c3e1894b4270d0bf9fa246c33568f9bf1 +++ /dev/null @@ -1,3 +0,0 @@ -xM -0F]$U1If`RS^< Omg3&7Ef K -WLNFs)v^3QBF"h~8xJ)f;cm;L3ܦ*ۋ/;;gu֪ϹzmuBn/hA \ No newline at end of file diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 b/test/integration/branchReset/expected/repo/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 deleted file mode 100644 index ea7fa53039077c16fa43ab0244a322d4d24fe9f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmb4S%^SLg|yFpm%oy_5Q@LNrc#=mehd019~do(F)T&-RsN8D3 zchE{5`pyh4l1V-wqV!C-XcHW>DLP1RbsPzaY(lZco!1UoV@8$~>;PCeXVOTNmJ-M) zTBJux0kep&err2SGn}XS%AZ)b2cL4Q7f@C?>#aivM=&TTF5)1a+T N_|1>Di7#y~KoFPVLQ4Pu diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/8c/7a45270a95d66c8e3b843df3f466be5dc19960 b/test/integration/branchReset/expected/repo/.git_keep/objects/8c/7a45270a95d66c8e3b843df3f466be5dc19960 deleted file mode 100644 index f502f942fc9df60df6dc206fe1d997c69219efbe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 117 zcmV-*0E+*30V^p=O;s>7Hf1m|00M=S%%arflKi4dhPf})xQn|?mb)6?5BcR%@`{q09r;rqwU{wGBvMe|*sF*nn diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 b/test/integration/branchReset/expected/repo/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 deleted file mode 100644 index ffc277c86c56c088175e46f1590082f30deb89cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmV-60LlM&0V^p=O;s>6WiT`_Ff%bxNXyJgWsu`~^A08nuUMF0Q* diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/a7/3e01f9d181ff16b3d821dd962e98accbd62936 b/test/integration/branchReset/expected/repo/.git_keep/objects/a7/3e01f9d181ff16b3d821dd962e98accbd62936 deleted file mode 100644 index 687d5f69e01873b794390d912a3c28dbd23c2333..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 157 zcmV;O0Al}m0gaA93c@fD06pgwdlzJrY&IJZ5j^>fwAs*tv86`v`4;?u*I@=`Tw0qu zI82AWse-dna*Y9f^1>WMtc`@62Bkt$Gl^Hq)vS5bX9tVS$RSX*E~yNxG$e8fC3-5V zHL#O17L(t7S~j@d;e5Ma^^@EB(9^iI3s|<1g`*=ViRL64~}f9k5tZSU}_U|pc5 L{fN~U$izP#g$PQ2 diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/c2/3c3e0496a9b3decc42344bfd94514f0834b93c b/test/integration/branchReset/expected/repo/.git_keep/objects/c2/3c3e0496a9b3decc42344bfd94514f0834b93c deleted file mode 100644 index 0a58eb348ab72ef2ca02cbb3ce213c3fae233d73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 157 zcmV;O0Al}m0gaAJ3c@fDKwak)vlk@)X+T8is>hf~r&ws45~Fy03tqtO<2`t}tn1vs z8hvV21SatoIap?vG*a#i`{>9-J2@mym@*++Ry$SM8aOnbLtrvExv^tyoy$=|vYvwY zgu*&8qoP-PlnVU-*M7Lmht_?OOD^jTOf(p~hz{XwwASjN$5fL)bv4cP+2B_}*7vtTeW00M=S%%arflKi4dhPf})xQn|?mb)6?5BcR%@`{q09r;rqw5K>@@RRI9MxkgfqqB}hR diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c b/test/integration/branchReset/expected/repo/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c deleted file mode 100644 index 74c919681..000000000 --- a/test/integration/branchReset/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/branchReset/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/branchReset/expected/repo/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f6f41f91b00976b4ff3f8f9935f7931e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb>`CU&08otwO#lD@ diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e b/test/integration/branchReset/expected/repo/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e deleted file mode 100644 index 3a7ee91eab601eb205b04a6e1e62c58599193222..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmb7nZts^PE0#+C9!Ty%L6BZHMO GUmgJUj1jT` diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 b/test/integration/branchReset/expected/repo/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 deleted file mode 100644 index 83998943a5a68dad92fe592c8b50a4121bd04c88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 86 zcmV-c0IC0Y0V^p=O;s?nWH2!R0)>>!qSWM){Gv*Rgo)QVH6WiT`_Ff%bxNXyJgWw@Wst9_>I*&F^-3WwAMy!>!qSWM){Gv*Rxi8eXi@QvgyBgmQ`SgTEJ!@r> rlc9lunTd%)T4qkFA%lOz8=h*;cdsLOc_gQllpoMO(W43g2J9QllRGE5 diff --git a/test/integration/branchReset/expected/repo/.git_keep/refs/heads/develop b/test/integration/branchReset/expected/repo/.git_keep/refs/heads/develop deleted file mode 100644 index 1d050416b..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/refs/heads/develop +++ /dev/null @@ -1 +0,0 @@ -27ba706fa463253f9189b2f258430877d2b5ed4f diff --git a/test/integration/branchReset/expected/repo/.git_keep/refs/heads/master b/test/integration/branchReset/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index 1d050416b..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -27ba706fa463253f9189b2f258430877d2b5ed4f diff --git a/test/integration/branchReset/expected/repo/directory/file b/test/integration/branchReset/expected/repo/directory/file deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/branchReset/expected/repo/directory/file +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/branchReset/expected/repo/directory/file2 b/test/integration/branchReset/expected/repo/directory/file2 deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/branchReset/expected/repo/directory/file2 +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/branchReset/expected/repo/file1 b/test/integration/branchReset/expected/repo/file1 deleted file mode 100644 index 4f80ec0c7..000000000 --- a/test/integration/branchReset/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 dog -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -once upon a time there was another dog diff --git a/test/integration/branchReset/expected/repo/file3 b/test/integration/branchReset/expected/repo/file3 deleted file mode 100644 index 1b9ae5f5d..000000000 --- a/test/integration/branchReset/expected/repo/file3 +++ /dev/null @@ -1 +0,0 @@ -once upon a time there was a mouse diff --git a/test/integration/branchReset/expected/repo/file4 b/test/integration/branchReset/expected/repo/file4 deleted file mode 100644 index 1b9ae5f5d..000000000 --- a/test/integration/branchReset/expected/repo/file4 +++ /dev/null @@ -1 +0,0 @@ -once upon a time there was a mouse diff --git a/test/integration/branchReset/expected/repo/file5 b/test/integration/branchReset/expected/repo/file5 deleted file mode 100644 index 1b9ae5f5d..000000000 --- a/test/integration/branchReset/expected/repo/file5 +++ /dev/null @@ -1 +0,0 @@ -once upon a time there was a mouse diff --git a/test/integration/branchReset/recording.json b/test/integration/branchReset/recording.json deleted file mode 100644 index 634471b7e..000000000 --- a/test/integration/branchReset/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":1037,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1523,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2155,"Mod":0,"Key":256,"Ch":103},{"Timestamp":3379,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3563,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3900,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5939,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/branchReset/setup.sh b/test/integration/branchReset/setup.sh deleted file mode 100644 index a1f14b455..000000000 --- a/test/integration/branchReset/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/branchReset/test.json b/test/integration/branchReset/test.json deleted file mode 100644 index 1082379ed..000000000 --- a/test/integration/branchReset/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/reset/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration_new/branch/reset/expected/repo/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..19d60e4ba --- /dev/null +++ b/test/integration_new/branch/reset/expected/repo/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +current-branch commit diff --git a/test/integration/branchReset/expected/repo/.git_keep/FETCH_HEAD b/test/integration_new/branch/reset/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/branchReset/expected/repo/.git_keep/FETCH_HEAD rename to test/integration_new/branch/reset/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration_new/branch/reset/expected/repo/.git_keep/HEAD b/test/integration_new/branch/reset/expected/repo/.git_keep/HEAD new file mode 100644 index 000000000..f381a9dda --- /dev/null +++ b/test/integration_new/branch/reset/expected/repo/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/current-branch diff --git a/test/integration_new/branch/reset/expected/repo/.git_keep/ORIG_HEAD b/test/integration_new/branch/reset/expected/repo/.git_keep/ORIG_HEAD new file mode 100644 index 000000000..784d8ea18 --- /dev/null +++ b/test/integration_new/branch/reset/expected/repo/.git_keep/ORIG_HEAD @@ -0,0 +1 @@ +bad42488b30daac9e329ccb76a758d78c484a463 diff --git a/test/integration/branchReset/expected/repo/.git_keep/config b/test/integration_new/branch/reset/expected/repo/.git_keep/config similarity index 74% rename from test/integration/branchReset/expected/repo/.git_keep/config rename to test/integration_new/branch/reset/expected/repo/.git_keep/config index 8ae104545..1723dc5b9 100644 --- a/test/integration/branchReset/expected/repo/.git_keep/config +++ b/test/integration_new/branch/reset/expected/repo/.git_keep/config @@ -8,3 +8,7 @@ [user] email = CI@example.com name = CI +[commit] + gpgSign = false +[protocol "file"] + allow = always diff --git a/test/integration/branchReset/expected/repo/.git_keep/description b/test/integration_new/branch/reset/expected/repo/.git_keep/description similarity index 100% rename from test/integration/branchReset/expected/repo/.git_keep/description rename to test/integration_new/branch/reset/expected/repo/.git_keep/description diff --git a/test/integration_new/branch/reset/expected/repo/.git_keep/index b/test/integration_new/branch/reset/expected/repo/.git_keep/index new file mode 100644 index 0000000000000000000000000000000000000000..65d675154f23ffb2d0196e017d44a5e7017550f5 GIT binary patch literal 65 zcmZ?q402{*U|<4bhL9jvS0E+HV4z^Y<=qr}%;|LA&IJiiy? 1671449839 +1100 commit (initial): root commit +bc64902742511e6be6e8d4f6aa90f113ab03f232 bc64902742511e6be6e8d4f6aa90f113ab03f232 CI 1671449839 +1100 checkout: moving from current-branch to other-branch +bc64902742511e6be6e8d4f6aa90f113ab03f232 0e9962fc70276ff33de86f77f20ed4482273711a CI 1671449839 +1100 commit: other-branch commit +0e9962fc70276ff33de86f77f20ed4482273711a bc64902742511e6be6e8d4f6aa90f113ab03f232 CI 1671449839 +1100 checkout: moving from other-branch to current-branch +bc64902742511e6be6e8d4f6aa90f113ab03f232 bad42488b30daac9e329ccb76a758d78c484a463 CI 1671449839 +1100 commit: current-branch commit +bad42488b30daac9e329ccb76a758d78c484a463 0e9962fc70276ff33de86f77f20ed4482273711a CI 1671449840 +1100 reset: moving to other-branch diff --git a/test/integration_new/branch/reset/expected/repo/.git_keep/logs/refs/heads/current-branch b/test/integration_new/branch/reset/expected/repo/.git_keep/logs/refs/heads/current-branch new file mode 100644 index 000000000..a90b621d5 --- /dev/null +++ b/test/integration_new/branch/reset/expected/repo/.git_keep/logs/refs/heads/current-branch @@ -0,0 +1,3 @@ +0000000000000000000000000000000000000000 bc64902742511e6be6e8d4f6aa90f113ab03f232 CI 1671449839 +1100 commit (initial): root commit +bc64902742511e6be6e8d4f6aa90f113ab03f232 bad42488b30daac9e329ccb76a758d78c484a463 CI 1671449839 +1100 commit: current-branch commit +bad42488b30daac9e329ccb76a758d78c484a463 0e9962fc70276ff33de86f77f20ed4482273711a CI 1671449840 +1100 reset: moving to other-branch diff --git a/test/integration_new/branch/reset/expected/repo/.git_keep/logs/refs/heads/other-branch b/test/integration_new/branch/reset/expected/repo/.git_keep/logs/refs/heads/other-branch new file mode 100644 index 000000000..a90e49460 --- /dev/null +++ b/test/integration_new/branch/reset/expected/repo/.git_keep/logs/refs/heads/other-branch @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 bc64902742511e6be6e8d4f6aa90f113ab03f232 CI 1671449839 +1100 branch: Created from HEAD +bc64902742511e6be6e8d4f6aa90f113ab03f232 0e9962fc70276ff33de86f77f20ed4482273711a CI 1671449839 +1100 commit: other-branch commit diff --git a/test/integration_new/branch/reset/expected/repo/.git_keep/objects/0e/9962fc70276ff33de86f77f20ed4482273711a b/test/integration_new/branch/reset/expected/repo/.git_keep/objects/0e/9962fc70276ff33de86f77f20ed4482273711a new file mode 100644 index 0000000000000000000000000000000000000000..aff4ca86c35aeb8499eb3712b6bbd7a4134825f1 GIT binary patch literal 155 zcmV;M0A&Ao0gaA93d0}}0DJZo-b>4>n~g##g`DyX*Q}&aV-O2{egpkLufq&Xs---; zwm_%eL^QIu!;%PXViFD!2xLIcexYE!&n$ugQ0=kF)-@k$06U@`j1giX@e5{(F+euP zMFy9xvnsy(TAQ9`eVgWod}7&Oa!s||wV}}<2JeDC8v~#YdQ5fsQ&+XG(k|TMmR9|X J)fc?;KK=VANUs0@ literal 0 HcmV?d00001 diff --git a/test/integration_new/branch/reset/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration_new/branch/reset/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 new file mode 100644 index 0000000000000000000000000000000000000000..adf64119a33d7621aeeaa505d30adb58afaa5559 GIT binary patch literal 15 WcmbX-i1K=UeduUWXZ&w3hO0 z+JHZ`Dx!(K>89k!BzD3ff&=M@v!7fr-e(q}0Hn59WoeoZHGt{Kbco_uocM{di!ne( zw2{GPV~vV?o7bv`QQwB~A@5kWmt50Y?iyW>M8Vsj&xio(pvP2`KXsM%`klFOjZ2#K KFIOKxbU)zweNf&2 literal 0 HcmV?d00001 diff --git a/test/integration_new/branch/reset/expected/repo/.git_keep/objects/bc/64902742511e6be6e8d4f6aa90f113ab03f232 b/test/integration_new/branch/reset/expected/repo/.git_keep/objects/bc/64902742511e6be6e8d4f6aa90f113ab03f232 new file mode 100644 index 0000000000000000000000000000000000000000..bf16466f3db351c25ef798e7f43c5de98a517f91 GIT binary patch literal 120 zcmV-;0Ehp00ga783IZ_<06q5=xeJoiG`1ij>}j9Tbh9W}x|9k&-vvM5b(mpFtMxg6 z0v<*;1J>xnQiOd`F-;i-EwHX}k>q1s)r=Fe%kS}M9i|zs(|os2uG`B_rPUjdT!=Zv abAlrgqTA^{8TO~{dTRrIk^2Jg!7iRVKR5;e literal 0 HcmV?d00001 diff --git a/test/integration_new/branch/reset/expected/repo/.git_keep/refs/heads/current-branch b/test/integration_new/branch/reset/expected/repo/.git_keep/refs/heads/current-branch new file mode 100644 index 000000000..7851aec36 --- /dev/null +++ b/test/integration_new/branch/reset/expected/repo/.git_keep/refs/heads/current-branch @@ -0,0 +1 @@ +0e9962fc70276ff33de86f77f20ed4482273711a diff --git a/test/integration_new/branch/reset/expected/repo/.git_keep/refs/heads/other-branch b/test/integration_new/branch/reset/expected/repo/.git_keep/refs/heads/other-branch new file mode 100644 index 000000000..7851aec36 --- /dev/null +++ b/test/integration_new/branch/reset/expected/repo/.git_keep/refs/heads/other-branch @@ -0,0 +1 @@ +0e9962fc70276ff33de86f77f20ed4482273711a