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 7128740a2..000000000 Binary files a/test/integration/branchReset/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/branchReset/expected/repo/.git_keep/logs/HEAD b/test/integration/branchReset/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index da396669b..000000000 --- a/test/integration/branchReset/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,18 +0,0 @@ -0000000000000000000000000000000000000000 3714b55ba17f3d8b0233c6e5924a5e497eb09bb7 CI 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 8d42c4c9e..000000000 Binary files a/test/integration/branchReset/expected/repo/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d and /dev/null differ 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 f74bf2335..000000000 Binary files a/test/integration/branchReset/expected/repo/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 and /dev/null differ 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 2b02dc3d1..000000000 Binary files a/test/integration/branchReset/expected/repo/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca and /dev/null differ 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 27c11bb26..000000000 Binary files a/test/integration/branchReset/expected/repo/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af and /dev/null differ 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 e8d63bced..000000000 Binary files a/test/integration/branchReset/expected/repo/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd and /dev/null differ diff --git a/test/integration/branchReset/expected/repo/.git_keep/objects/37/14b55ba17f3d8b0233c6e5924a5e497eb09bb7 b/test/integration/branchReset/expected/repo/.git_keep/objects/37/14b55ba17f3d8b0233c6e5924a5e497eb09bb7 deleted file mode 100644 index d7f891ede..000000000 Binary files a/test/integration/branchReset/expected/repo/.git_keep/objects/37/14b55ba17f3d8b0233c6e5924a5e497eb09bb7 and /dev/null differ 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> $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 000000000..65d675154 Binary files /dev/null and b/test/integration_new/branch/reset/expected/repo/.git_keep/index differ diff --git a/test/integration/branchReset/expected/repo/.git_keep/info/exclude b/test/integration_new/branch/reset/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/branchReset/expected/repo/.git_keep/info/exclude rename to test/integration_new/branch/reset/expected/repo/.git_keep/info/exclude diff --git a/test/integration_new/branch/reset/expected/repo/.git_keep/logs/HEAD b/test/integration_new/branch/reset/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..6e6411574 --- /dev/null +++ b/test/integration_new/branch/reset/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,6 @@ +0000000000000000000000000000000000000000 bc64902742511e6be6e8d4f6aa90f113ab03f232 CI 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 000000000..aff4ca86c Binary files /dev/null and b/test/integration_new/branch/reset/expected/repo/.git_keep/objects/0e/9962fc70276ff33de86f77f20ed4482273711a differ 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 000000000..adf64119a Binary files /dev/null and b/test/integration_new/branch/reset/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 differ diff --git a/test/integration_new/branch/reset/expected/repo/.git_keep/objects/ba/d42488b30daac9e329ccb76a758d78c484a463 b/test/integration_new/branch/reset/expected/repo/.git_keep/objects/ba/d42488b30daac9e329ccb76a758d78c484a463 new file mode 100644 index 000000000..cfcb2be5c Binary files /dev/null and b/test/integration_new/branch/reset/expected/repo/.git_keep/objects/ba/d42488b30daac9e329ccb76a758d78c484a463 differ 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 000000000..bf16466f3 Binary files /dev/null and b/test/integration_new/branch/reset/expected/repo/.git_keep/objects/bc/64902742511e6be6e8d4f6aa90f113ab03f232 differ 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