diff --git a/pkg/integration/components/shell.go b/pkg/integration/components/shell.go index ee57cf401..7b7a68543 100644 --- a/pkg/integration/components/shell.go +++ b/pkg/integration/components/shell.go @@ -44,6 +44,10 @@ func (s *Shell) NewBranch(name string) *Shell { return s.RunCommand("git checkout -b " + name) } +func (s *Shell) Checkout(name string) *Shell { + return s.RunCommand("git checkout " + name) +} + func (s *Shell) GitAdd(path string) *Shell { return s.RunCommand(fmt.Sprintf("git add \"%s\"", path)) } diff --git a/pkg/integration/tests/bisect/from_other_branch.go b/pkg/integration/tests/bisect/from_other_branch.go new file mode 100644 index 000000000..4ef9a4d73 --- /dev/null +++ b/pkg/integration/tests/bisect/from_other_branch.go @@ -0,0 +1,69 @@ +package bisect + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var FromOtherBranch = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Opening lazygit when bisect has been started from another branch. There's an issue where we don't reselect the current branch if we mark the current branch as bad so this test side-steps that problem", + ExtraCmdArgs: "", + Skip: false, + SetupRepo: func(shell *Shell) { + shell. + EmptyCommit("only commit on master"). // this'll ensure we have a master branch + NewBranch("other"). + CreateNCommits(10). + Checkout("master"). + RunCommand("git bisect start other~2 other~5") + }, + SetupConfig: func(cfg *config.AppConfig) {}, + Run: func( + shell *Shell, + input *Input, + assert *Assert, + keys config.KeybindingConfig, + ) { + viewBisectOptions := func() { + input.PressKeys(keys.Commits.ViewBisectOptions) + assert.InMenu() + } + + markCommitAsGood := func() { + viewBisectOptions() + assert.MatchSelectedLine(Contains("bad")) + input.NextItem() + assert.MatchSelectedLine(Contains("good")) + + input.Confirm() + } + + assert.MatchViewContent("information", Contains("bisecting")) + + assert.AtLeastOneCommit() + + input.SwitchToCommitsWindow() + + assert.MatchSelectedLine(Contains("<-- bad")) + assert.MatchSelectedLine(Contains("commit 08")) + + input.NextItem() + assert.MatchSelectedLine(Contains("<-- current")) + assert.MatchSelectedLine(Contains("commit 07")) + + markCommitAsGood() + + assert.InAlert() + assert.MatchCurrentViewContent(Contains("Bisect complete!")) + assert.MatchCurrentViewContent(Contains("commit 08")) + assert.MatchCurrentViewContent(Contains("Do you want to reset")) + input.Confirm() + + assert.MatchViewContent("information", NotContains("bisecting")) + + // back in master branch which just had the one commit + assert.CurrentViewName("commits") + assert.CommitCount(1) + assert.MatchSelectedLine(Contains("only commit on master")) + }, +}) diff --git a/pkg/integration/tests/tests.go b/pkg/integration/tests/tests.go index 5668fcbba..6fcd8249f 100644 --- a/pkg/integration/tests/tests.go +++ b/pkg/integration/tests/tests.go @@ -29,6 +29,7 @@ var tests = []*components.IntegrationTest{ custom_commands.MultiplePrompts, custom_commands.MenuFromCommand, bisect.Basic, + bisect.FromOtherBranch, } func GetTests() []*components.IntegrationTest { diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_ANCESTORS_OK b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_ANCESTORS_OK deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_EXPECTED_REV b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_EXPECTED_REV deleted file mode 100644 index df35eff7a..000000000 --- a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_EXPECTED_REV +++ /dev/null @@ -1 +0,0 @@ -10e171beacb963e4f8a4dc1d80fd291c135902bb diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_LOG b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_LOG deleted file mode 100644 index 6a5f8b695..000000000 --- a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_LOG +++ /dev/null @@ -1,12 +0,0 @@ -# bad: [0f373801691c466240bd131d28b2168712b045ba] commit 18 -# good: [38242e5215bc35b3e418c1d6d63fd0291001e10b] commit 7 -git bisect start 'other~2' 'other~13' -# bad: [d27a997859219951ecc95c351174c70ea0cf9d37] commit 12 -git bisect bad d27a997859219951ecc95c351174c70ea0cf9d37 -# good: [3fbb9e626d4b7d30e58346b3eefaa342b15ab776] commit 9 -git bisect good 3fbb9e626d4b7d30e58346b3eefaa342b15ab776 -# bad: [d84e0684b1038552d5c8d86e67398d634f77ad3b] commit 11 -git bisect bad d84e0684b1038552d5c8d86e67398d634f77ad3b -# bad: [10e171beacb963e4f8a4dc1d80fd291c135902bb] commit 10 -git bisect bad 10e171beacb963e4f8a4dc1d80fd291c135902bb -# first bad commit: [10e171beacb963e4f8a4dc1d80fd291c135902bb] commit 10 diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_NAMES b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_NAMES deleted file mode 100644 index 8b1378917..000000000 --- a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_NAMES +++ /dev/null @@ -1 +0,0 @@ - diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_START b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_START deleted file mode 100644 index 1f7391f92..000000000 --- a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_START +++ /dev/null @@ -1 +0,0 @@ -master diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_TERMS b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_TERMS deleted file mode 100644 index 25dd30b14..000000000 --- a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_TERMS +++ /dev/null @@ -1,2 +0,0 @@ -bad -good diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index e6cf6d392..000000000 --- a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -commit 20 diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/HEAD b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/HEAD deleted file mode 100644 index cea9d05ed..000000000 --- a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/test diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/index b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/index deleted file mode 100644 index c469e6ea5..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/index and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/logs/HEAD b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index 31a81bf7a..000000000 --- a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,28 +0,0 @@ -0000000000000000000000000000000000000000 36903784186b1b8b4a150dc656eccd49f94e114e CI 1643177881 +1100 commit (initial): first commit -36903784186b1b8b4a150dc656eccd49f94e114e 36903784186b1b8b4a150dc656eccd49f94e114e CI 1643177881 +1100 checkout: moving from master to other -36903784186b1b8b4a150dc656eccd49f94e114e 1ab342c03b4226cca1c751dba71fa2df0e7d82ee CI 1643177881 +1100 commit: commit 1 -1ab342c03b4226cca1c751dba71fa2df0e7d82ee 15d4c5b8608fe472fd224333e60d44ea826cc80e CI 1643177881 +1100 commit: commit 2 -15d4c5b8608fe472fd224333e60d44ea826cc80e b614152a335aabd8b5daa2c6abccc9425eb14177 CI 1643177881 +1100 commit: commit 3 -b614152a335aabd8b5daa2c6abccc9425eb14177 1a35564b85e24c96e647b477aaf8d35dcf0de84d CI 1643177881 +1100 commit: commit 4 -1a35564b85e24c96e647b477aaf8d35dcf0de84d 11e4fd4011c9ed3800bb33b85580dd1d09f6aefd CI 1643177881 +1100 commit: commit 5 -11e4fd4011c9ed3800bb33b85580dd1d09f6aefd 3068d0d730547aaa5b86dbfe638db83133ae1421 CI 1643177881 +1100 commit: commit 6 -3068d0d730547aaa5b86dbfe638db83133ae1421 38242e5215bc35b3e418c1d6d63fd0291001e10b CI 1643177881 +1100 commit: commit 7 -38242e5215bc35b3e418c1d6d63fd0291001e10b ff231021500c7beb87de0d6d5edc29b6f9c000b1 CI 1643177881 +1100 commit: commit 8 -ff231021500c7beb87de0d6d5edc29b6f9c000b1 3fbb9e626d4b7d30e58346b3eefaa342b15ab776 CI 1643177881 +1100 commit: commit 9 -3fbb9e626d4b7d30e58346b3eefaa342b15ab776 10e171beacb963e4f8a4dc1d80fd291c135902bb CI 1643177881 +1100 commit: commit 10 -10e171beacb963e4f8a4dc1d80fd291c135902bb d84e0684b1038552d5c8d86e67398d634f77ad3b CI 1643177882 +1100 commit: commit 11 -d84e0684b1038552d5c8d86e67398d634f77ad3b d27a997859219951ecc95c351174c70ea0cf9d37 CI 1643177882 +1100 commit: commit 12 -d27a997859219951ecc95c351174c70ea0cf9d37 3fd9ad29c185eac6106cfa005a3aa594e21b9e06 CI 1643177882 +1100 commit: commit 13 -3fd9ad29c185eac6106cfa005a3aa594e21b9e06 b2970eba9fd8dba8655094dc38fb4ee50b9bf23e CI 1643177882 +1100 commit: commit 14 -b2970eba9fd8dba8655094dc38fb4ee50b9bf23e 6fa769bf11bd9dc4ff4e85f4951950b0bc34326f CI 1643177882 +1100 commit: commit 15 -6fa769bf11bd9dc4ff4e85f4951950b0bc34326f 9c836a5c3f513818d300b410f8cb3a2e3bbd42a1 CI 1643177882 +1100 commit: commit 16 -9c836a5c3f513818d300b410f8cb3a2e3bbd42a1 5493d27d38b9902cf28b1035c644bf470df76060 CI 1643177882 +1100 commit: commit 17 -5493d27d38b9902cf28b1035c644bf470df76060 0f373801691c466240bd131d28b2168712b045ba CI 1643177882 +1100 commit: commit 18 -0f373801691c466240bd131d28b2168712b045ba 333ff293caf2d3216edf22e3f1df64d43a7e1311 CI 1643177882 +1100 commit: commit 19 -333ff293caf2d3216edf22e3f1df64d43a7e1311 e559f83c6e8dd11680de70b487725e37ff2e283f CI 1643177882 +1100 commit: commit 20 -e559f83c6e8dd11680de70b487725e37ff2e283f 36903784186b1b8b4a150dc656eccd49f94e114e CI 1643177882 +1100 checkout: moving from other to master -36903784186b1b8b4a150dc656eccd49f94e114e d27a997859219951ecc95c351174c70ea0cf9d37 CI 1643177882 +1100 checkout: moving from master to d27a997859219951ecc95c351174c70ea0cf9d37 -d27a997859219951ecc95c351174c70ea0cf9d37 3fbb9e626d4b7d30e58346b3eefaa342b15ab776 CI 1643177885 +1100 checkout: moving from d27a997859219951ecc95c351174c70ea0cf9d37 to 3fbb9e626d4b7d30e58346b3eefaa342b15ab776 -3fbb9e626d4b7d30e58346b3eefaa342b15ab776 d84e0684b1038552d5c8d86e67398d634f77ad3b CI 1643177886 +1100 checkout: moving from 3fbb9e626d4b7d30e58346b3eefaa342b15ab776 to d84e0684b1038552d5c8d86e67398d634f77ad3b -d84e0684b1038552d5c8d86e67398d634f77ad3b 10e171beacb963e4f8a4dc1d80fd291c135902bb CI 1643177888 +1100 checkout: moving from d84e0684b1038552d5c8d86e67398d634f77ad3b to 10e171beacb963e4f8a4dc1d80fd291c135902bb -10e171beacb963e4f8a4dc1d80fd291c135902bb 36903784186b1b8b4a150dc656eccd49f94e114e CI 1643177893 +1100 checkout: moving from 10e171beacb963e4f8a4dc1d80fd291c135902bb to test diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/logs/refs/heads/master deleted file mode 100644 index 4aff8c25b..000000000 --- a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 36903784186b1b8b4a150dc656eccd49f94e114e CI 1643177881 +1100 commit (initial): first commit diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/logs/refs/heads/other b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/logs/refs/heads/other deleted file mode 100644 index db03baa43..000000000 --- a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/logs/refs/heads/other +++ /dev/null @@ -1,21 +0,0 @@ -0000000000000000000000000000000000000000 36903784186b1b8b4a150dc656eccd49f94e114e CI 1643177881 +1100 branch: Created from HEAD -36903784186b1b8b4a150dc656eccd49f94e114e 1ab342c03b4226cca1c751dba71fa2df0e7d82ee CI 1643177881 +1100 commit: commit 1 -1ab342c03b4226cca1c751dba71fa2df0e7d82ee 15d4c5b8608fe472fd224333e60d44ea826cc80e CI 1643177881 +1100 commit: commit 2 -15d4c5b8608fe472fd224333e60d44ea826cc80e b614152a335aabd8b5daa2c6abccc9425eb14177 CI 1643177881 +1100 commit: commit 3 -b614152a335aabd8b5daa2c6abccc9425eb14177 1a35564b85e24c96e647b477aaf8d35dcf0de84d CI 1643177881 +1100 commit: commit 4 -1a35564b85e24c96e647b477aaf8d35dcf0de84d 11e4fd4011c9ed3800bb33b85580dd1d09f6aefd CI 1643177881 +1100 commit: commit 5 -11e4fd4011c9ed3800bb33b85580dd1d09f6aefd 3068d0d730547aaa5b86dbfe638db83133ae1421 CI 1643177881 +1100 commit: commit 6 -3068d0d730547aaa5b86dbfe638db83133ae1421 38242e5215bc35b3e418c1d6d63fd0291001e10b CI 1643177881 +1100 commit: commit 7 -38242e5215bc35b3e418c1d6d63fd0291001e10b ff231021500c7beb87de0d6d5edc29b6f9c000b1 CI 1643177881 +1100 commit: commit 8 -ff231021500c7beb87de0d6d5edc29b6f9c000b1 3fbb9e626d4b7d30e58346b3eefaa342b15ab776 CI 1643177881 +1100 commit: commit 9 -3fbb9e626d4b7d30e58346b3eefaa342b15ab776 10e171beacb963e4f8a4dc1d80fd291c135902bb CI 1643177881 +1100 commit: commit 10 -10e171beacb963e4f8a4dc1d80fd291c135902bb d84e0684b1038552d5c8d86e67398d634f77ad3b CI 1643177882 +1100 commit: commit 11 -d84e0684b1038552d5c8d86e67398d634f77ad3b d27a997859219951ecc95c351174c70ea0cf9d37 CI 1643177882 +1100 commit: commit 12 -d27a997859219951ecc95c351174c70ea0cf9d37 3fd9ad29c185eac6106cfa005a3aa594e21b9e06 CI 1643177882 +1100 commit: commit 13 -3fd9ad29c185eac6106cfa005a3aa594e21b9e06 b2970eba9fd8dba8655094dc38fb4ee50b9bf23e CI 1643177882 +1100 commit: commit 14 -b2970eba9fd8dba8655094dc38fb4ee50b9bf23e 6fa769bf11bd9dc4ff4e85f4951950b0bc34326f CI 1643177882 +1100 commit: commit 15 -6fa769bf11bd9dc4ff4e85f4951950b0bc34326f 9c836a5c3f513818d300b410f8cb3a2e3bbd42a1 CI 1643177882 +1100 commit: commit 16 -9c836a5c3f513818d300b410f8cb3a2e3bbd42a1 5493d27d38b9902cf28b1035c644bf470df76060 CI 1643177882 +1100 commit: commit 17 -5493d27d38b9902cf28b1035c644bf470df76060 0f373801691c466240bd131d28b2168712b045ba CI 1643177882 +1100 commit: commit 18 -0f373801691c466240bd131d28b2168712b045ba 333ff293caf2d3216edf22e3f1df64d43a7e1311 CI 1643177882 +1100 commit: commit 19 -333ff293caf2d3216edf22e3f1df64d43a7e1311 e559f83c6e8dd11680de70b487725e37ff2e283f CI 1643177882 +1100 commit: commit 20 diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/logs/refs/heads/test b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/logs/refs/heads/test deleted file mode 100644 index 7ae7f188f..000000000 --- a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/logs/refs/heads/test +++ /dev/null @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 36903784186b1b8b4a150dc656eccd49f94e114e CI 1643177893 +1100 branch: Created from master diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/00/750edc07d6415dcc07ae0351e9397b0222b7ba b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/00/750edc07d6415dcc07ae0351e9397b0222b7ba deleted file mode 100644 index d3c45d51e..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/00/750edc07d6415dcc07ae0351e9397b0222b7ba and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/03/ecdaa424af1fdaeab1bd1852319652b9518f11 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/03/ecdaa424af1fdaeab1bd1852319652b9518f11 deleted file mode 100644 index 355004b9e..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/03/ecdaa424af1fdaeab1bd1852319652b9518f11 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/04/a577be2858b8024716876aefe6b665a98e1e4f b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/04/a577be2858b8024716876aefe6b665a98e1e4f deleted file mode 100644 index da9396d18..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/04/a577be2858b8024716876aefe6b665a98e1e4f and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/05/57fc43da38567eae00831e9b385fd2cad22643 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/05/57fc43da38567eae00831e9b385fd2cad22643 deleted file mode 100644 index 0ff3d683a..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/05/57fc43da38567eae00831e9b385fd2cad22643 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/0c/fbf08886fca9a91cb753ec8734c84fcbe52c9f b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/0c/fbf08886fca9a91cb753ec8734c84fcbe52c9f deleted file mode 100644 index da246e1fe..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/0c/fbf08886fca9a91cb753ec8734c84fcbe52c9f and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/0d/1bbe8d012c8c070167a006a4898b525cfbd930 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/0d/1bbe8d012c8c070167a006a4898b525cfbd930 deleted file mode 100644 index be2aa4386..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/0d/1bbe8d012c8c070167a006a4898b525cfbd930 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/0f/373801691c466240bd131d28b2168712b045ba b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/0f/373801691c466240bd131d28b2168712b045ba deleted file mode 100644 index 97cb55d14..000000000 --- a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/0f/373801691c466240bd131d28b2168712b045ba +++ /dev/null @@ -1,3 +0,0 @@ -xK -0@]d&IEzcKzx(i쵂ffΤ"K("F$Sda#&{} p6}1!ň:7qMz,32*yü4/=% -֐!h8!Sz9 \ No newline at end of file diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/10/e171beacb963e4f8a4dc1d80fd291c135902bb b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/10/e171beacb963e4f8a4dc1d80fd291c135902bb deleted file mode 100644 index 72e97d561..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/10/e171beacb963e4f8a4dc1d80fd291c135902bb and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/11/e4fd4011c9ed3800bb33b85580dd1d09f6aefd b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/11/e4fd4011c9ed3800bb33b85580dd1d09f6aefd deleted file mode 100644 index 76c433f1e..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/11/e4fd4011c9ed3800bb33b85580dd1d09f6aefd and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/15/d4c5b8608fe472fd224333e60d44ea826cc80e b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/15/d4c5b8608fe472fd224333e60d44ea826cc80e deleted file mode 100644 index 1bbb2bb68..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/15/d4c5b8608fe472fd224333e60d44ea826cc80e and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/1a/35564b85e24c96e647b477aaf8d35dcf0de84d b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/1a/35564b85e24c96e647b477aaf8d35dcf0de84d deleted file mode 100644 index 90434de85..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/1a/35564b85e24c96e647b477aaf8d35dcf0de84d and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/1a/b342c03b4226cca1c751dba71fa2df0e7d82ee b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/1a/b342c03b4226cca1c751dba71fa2df0e7d82ee deleted file mode 100644 index 89ad61ab4..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/1a/b342c03b4226cca1c751dba71fa2df0e7d82ee and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/1e/8b314962144c26d5e0e50fd29d2ca327864913 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/1e/8b314962144c26d5e0e50fd29d2ca327864913 deleted file mode 100644 index f1722ae00..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/1e/8b314962144c26d5e0e50fd29d2ca327864913 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/20/9e3ef4b6247ce746048d5711befda46206d235 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/20/9e3ef4b6247ce746048d5711befda46206d235 deleted file mode 100644 index 12e1f82f1..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/20/9e3ef4b6247ce746048d5711befda46206d235 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/26/661287266e53bda69d8daa3aac1f714650f13c b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/26/661287266e53bda69d8daa3aac1f714650f13c deleted file mode 100644 index 77e40c5af..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/26/661287266e53bda69d8daa3aac1f714650f13c and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/30/68d0d730547aaa5b86dbfe638db83133ae1421 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/30/68d0d730547aaa5b86dbfe638db83133ae1421 deleted file mode 100644 index 8d4ae0999..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/30/68d0d730547aaa5b86dbfe638db83133ae1421 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/31/df6c951dc82b75b11bc48836e780134a16e6ad b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/31/df6c951dc82b75b11bc48836e780134a16e6ad deleted file mode 100644 index 204aace94..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/31/df6c951dc82b75b11bc48836e780134a16e6ad and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/33/3ff293caf2d3216edf22e3f1df64d43a7e1311 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/33/3ff293caf2d3216edf22e3f1df64d43a7e1311 deleted file mode 100644 index 36368d1fc..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/33/3ff293caf2d3216edf22e3f1df64d43a7e1311 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/36/903784186b1b8b4a150dc656eccd49f94e114e b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/36/903784186b1b8b4a150dc656eccd49f94e114e deleted file mode 100644 index abb03d100..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/36/903784186b1b8b4a150dc656eccd49f94e114e and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/38/242e5215bc35b3e418c1d6d63fd0291001e10b b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/38/242e5215bc35b3e418c1d6d63fd0291001e10b deleted file mode 100644 index 5ca009d7c..000000000 --- a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/38/242e5215bc35b3e418c1d6d63fd0291001e10b +++ /dev/null @@ -1,2 +0,0 @@ -xM -@ @asL'U(X[.<ǷxmG""r:Y&ʄDb:y0eoy}ک-0GR޻S?}-: \ No newline at end of file diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3a/05ed1ca9671bc362c7197eb09bddff040c9110 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3a/05ed1ca9671bc362c7197eb09bddff040c9110 deleted file mode 100644 index 1ede294e1..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3a/05ed1ca9671bc362c7197eb09bddff040c9110 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3b/e94d6b1b1b3b63db9e412b2e788d08979bc176 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3b/e94d6b1b1b3b63db9e412b2e788d08979bc176 deleted file mode 100644 index 00f0e0176..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3b/e94d6b1b1b3b63db9e412b2e788d08979bc176 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3c/032078a4a21c5c51d3c93d91717c1dabbb8cd0 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3c/032078a4a21c5c51d3c93d91717c1dabbb8cd0 deleted file mode 100644 index ecdb2d612..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3c/032078a4a21c5c51d3c93d91717c1dabbb8cd0 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3f/bb9e626d4b7d30e58346b3eefaa342b15ab776 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3f/bb9e626d4b7d30e58346b3eefaa342b15ab776 deleted file mode 100644 index 344405069..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3f/bb9e626d4b7d30e58346b3eefaa342b15ab776 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3f/d9ad29c185eac6106cfa005a3aa594e21b9e06 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3f/d9ad29c185eac6106cfa005a3aa594e21b9e06 deleted file mode 100644 index f03b029ab..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3f/d9ad29c185eac6106cfa005a3aa594e21b9e06 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/43/99b07bd31d1f58a0ff10b5434d5ff4f36e38fb b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/43/99b07bd31d1f58a0ff10b5434d5ff4f36e38fb deleted file mode 100644 index 23915f2bc..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/43/99b07bd31d1f58a0ff10b5434d5ff4f36e38fb and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/45/a4fb75db864000d01701c0f7a51864bd4daabf b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/45/a4fb75db864000d01701c0f7a51864bd4daabf deleted file mode 100644 index fdf2bc81d..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/45/a4fb75db864000d01701c0f7a51864bd4daabf and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/48/082f72f087ce7e6fa75b9c41d7387daecd447b b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/48/082f72f087ce7e6fa75b9c41d7387daecd447b deleted file mode 100644 index 23ff2840f..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/48/082f72f087ce7e6fa75b9c41d7387daecd447b and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/4a/9e01012c736e5e0998b7184d9a54e8c610ed02 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/4a/9e01012c736e5e0998b7184d9a54e8c610ed02 deleted file mode 100644 index 3b4ccc564..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/4a/9e01012c736e5e0998b7184d9a54e8c610ed02 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/54/93d27d38b9902cf28b1035c644bf470df76060 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/54/93d27d38b9902cf28b1035c644bf470df76060 deleted file mode 100644 index 166e5ee14..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/54/93d27d38b9902cf28b1035c644bf470df76060 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/60/d3b2f4a4cd5f1637eba020358bfe5ecb5edcf2 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/60/d3b2f4a4cd5f1637eba020358bfe5ecb5edcf2 deleted file mode 100644 index d94cbe67d..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/60/d3b2f4a4cd5f1637eba020358bfe5ecb5edcf2 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/6f/a769bf11bd9dc4ff4e85f4951950b0bc34326f b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/6f/a769bf11bd9dc4ff4e85f4951950b0bc34326f deleted file mode 100644 index 7f9ad8243..000000000 --- a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/6f/a769bf11bd9dc4ff4e85f4951950b0bc34326f +++ /dev/null @@ -1,3 +0,0 @@ -xA -1 @Q=E$M@Dh C,<[9ƦjjS 8X< -plּkXq@%sT%S xSI54/o<߮}},b1NS"r`O `;w \ No newline at end of file diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/74/cd0e856d938eb6b665284c5485c00f87e20dc5 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/74/cd0e856d938eb6b665284c5485c00f87e20dc5 deleted file mode 100644 index 988810145..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/74/cd0e856d938eb6b665284c5485c00f87e20dc5 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/7c/fd51ebd06287effcfdab241235305cb6439d40 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/7c/fd51ebd06287effcfdab241235305cb6439d40 deleted file mode 100644 index 8a6a651ca..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/7c/fd51ebd06287effcfdab241235305cb6439d40 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/7e/d6ff82de6bcc2a78243fc9c54d3ef5ac14da69 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/7e/d6ff82de6bcc2a78243fc9c54d3ef5ac14da69 deleted file mode 100644 index 637482d7a..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/7e/d6ff82de6bcc2a78243fc9c54d3ef5ac14da69 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/7f/8f011eb73d6043d2e6db9d2c101195ae2801f2 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/7f/8f011eb73d6043d2e6db9d2c101195ae2801f2 deleted file mode 100644 index 60454ab43..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/7f/8f011eb73d6043d2e6db9d2c101195ae2801f2 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/83/51c19397f4fcd5238d10034fa7fa384f14d580 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/83/51c19397f4fcd5238d10034fa7fa384f14d580 deleted file mode 100644 index 12805e960..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/83/51c19397f4fcd5238d10034fa7fa384f14d580 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/88/8633a131a49f1b8981d70c13d666defed6ba15 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/88/8633a131a49f1b8981d70c13d666defed6ba15 deleted file mode 100644 index 1c62650e2..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/88/8633a131a49f1b8981d70c13d666defed6ba15 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/8b/0156bd25a1ecd82ef7c4c53e9d6d312bb6d403 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/8b/0156bd25a1ecd82ef7c4c53e9d6d312bb6d403 deleted file mode 100644 index f78367c1d..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/8b/0156bd25a1ecd82ef7c4c53e9d6d312bb6d403 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/90/dfebd90b0a89766c39928f22901b8c02b51fda b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/90/dfebd90b0a89766c39928f22901b8c02b51fda deleted file mode 100644 index 851fbe7da..000000000 --- a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/90/dfebd90b0a89766c39928f22901b8c02b51fda +++ /dev/null @@ -1 +0,0 @@ -x+)JMU03c040031QHIeH˒b(v;wT>G7]ݭ<ơ'=B \ No newline at end of file diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/98/d9bcb75a685dfbfd60f611c309410152935b3d b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/98/d9bcb75a685dfbfd60f611c309410152935b3d deleted file mode 100644 index f6e750c5d..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/98/d9bcb75a685dfbfd60f611c309410152935b3d and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/9c/836a5c3f513818d300b410f8cb3a2e3bbd42a1 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/9c/836a5c3f513818d300b410f8cb3a2e3bbd42a1 deleted file mode 100644 index 22a928539..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/9c/836a5c3f513818d300b410f8cb3a2e3bbd42a1 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/9d/33ec0915534bf6401be9412203697791e40a04 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/9d/33ec0915534bf6401be9412203697791e40a04 deleted file mode 100644 index c6c240e0c..000000000 --- a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/9d/33ec0915534bf6401be9412203697791e40a04 +++ /dev/null @@ -1 +0,0 @@ -x+)JMU03c040031QHIeʕ2ۃߴ?Tg>T>G7]ݭ<ơ'=G \ No newline at end of file diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b1/bd38b62a0800a4f6a80c34e21c5acffae52c7e b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b1/bd38b62a0800a4f6a80c34e21c5acffae52c7e deleted file mode 100644 index 268d0f459..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b1/bd38b62a0800a4f6a80c34e21c5acffae52c7e and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b2/970eba9fd8dba8655094dc38fb4ee50b9bf23e b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b2/970eba9fd8dba8655094dc38fb4ee50b9bf23e deleted file mode 100644 index e9a1d720b..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b2/970eba9fd8dba8655094dc38fb4ee50b9bf23e and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b4/de3947675361a7770d29b8982c407b0ec6b2a0 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b4/de3947675361a7770d29b8982c407b0ec6b2a0 deleted file mode 100644 index 6d65f13b4..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b4/de3947675361a7770d29b8982c407b0ec6b2a0 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b6/14152a335aabd8b5daa2c6abccc9425eb14177 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b6/14152a335aabd8b5daa2c6abccc9425eb14177 deleted file mode 100644 index 7e8fb3f28..000000000 --- a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b6/14152a335aabd8b5daa2c6abccc9425eb14177 +++ /dev/null @@ -1,2 +0,0 @@ -xK -1] ҝDYyA8㛅p[T=?cєIE,Lp@*8!.jٕ!6j%"Pg *}rvOSNFo CqNt5/o:` \ No newline at end of file diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b6/a7d89c68e0ca66e96a9a51892cc33db66fb8a3 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b6/a7d89c68e0ca66e96a9a51892cc33db66fb8a3 deleted file mode 100644 index 02dc68891..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b6/a7d89c68e0ca66e96a9a51892cc33db66fb8a3 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b8/626c4cff2849624fb67f87cd0ad72b163671ad b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b8/626c4cff2849624fb67f87cd0ad72b163671ad deleted file mode 100644 index 0761b6105..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b8/626c4cff2849624fb67f87cd0ad72b163671ad and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/cd/c58c0f95a2313ded9185e102bc35253f6a1bed b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/cd/c58c0f95a2313ded9185e102bc35253f6a1bed deleted file mode 100644 index 13147f24b..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/cd/c58c0f95a2313ded9185e102bc35253f6a1bed and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d0/0491fd7e5bb6fa28c517a0bb32b8b506539d4d b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d0/0491fd7e5bb6fa28c517a0bb32b8b506539d4d deleted file mode 100644 index 8dab6a9ea..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d0/0491fd7e5bb6fa28c517a0bb32b8b506539d4d and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d2/7a997859219951ecc95c351174c70ea0cf9d37 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d2/7a997859219951ecc95c351174c70ea0cf9d37 deleted file mode 100644 index 1efdcdbe0..000000000 --- a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d2/7a997859219951ecc95c351174c70ea0cf9d37 +++ /dev/null @@ -1,3 +0,0 @@ -xM -0F]$)1cK|Wp -~@,=Jf Eupơj_rpvb՞yu`rڒ}! !ډ8XWcLlJ~XV&\֮c$2pFZuDuSF}W: \ No newline at end of file diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d3/6e09d97bf2c1527118bde353ad64b157f8b269 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d3/6e09d97bf2c1527118bde353ad64b157f8b269 deleted file mode 100644 index efc598268..000000000 --- a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d3/6e09d97bf2c1527118bde353ad64b157f8b269 +++ /dev/null @@ -1 +0,0 @@ -x+)JMU03c040031QHIe2o]_G6ڱ-x/T>G7]ݭ<ơ'= 5 \ No newline at end of file diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d4/e982570808a24722649e852a92bda5cf54c9dd b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d4/e982570808a24722649e852a92bda5cf54c9dd deleted file mode 100644 index 262f6ef1f..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d4/e982570808a24722649e852a92bda5cf54c9dd and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d6/b24041cf04154f8f902651969675021f4d93a5 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d6/b24041cf04154f8f902651969675021f4d93a5 deleted file mode 100644 index 1ece9675c..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d6/b24041cf04154f8f902651969675021f4d93a5 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d8/4e0684b1038552d5c8d86e67398d634f77ad3b b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d8/4e0684b1038552d5c8d86e67398d634f77ad3b deleted file mode 100644 index 4a21451f3..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d8/4e0684b1038552d5c8d86e67398d634f77ad3b and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/da/8dacb2a073ebc2adeddceb3cc2b39b6c95c858 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/da/8dacb2a073ebc2adeddceb3cc2b39b6c95c858 deleted file mode 100644 index 336fa7996..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/da/8dacb2a073ebc2adeddceb3cc2b39b6c95c858 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/db/76c03074879025735b647b825786a7b3fcfe7c b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/db/76c03074879025735b647b825786a7b3fcfe7c deleted file mode 100644 index b19f46c3d..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/db/76c03074879025735b647b825786a7b3fcfe7c and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/e5/59f83c6e8dd11680de70b487725e37ff2e283f b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/e5/59f83c6e8dd11680de70b487725e37ff2e283f deleted file mode 100644 index 44afe2d13..000000000 --- a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/e5/59f83c6e8dd11680de70b487725e37ff2e283f +++ /dev/null @@ -1,3 +0,0 @@ -xA -0E]$3&)]c2Df\ʺ,8CUC -!&>3xlTm3E*FFlX-X"#:y4ye{ꩬaJ9w}QM>w_?R: \ No newline at end of file diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 deleted file mode 100644 index 711223894..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/ec/635144f60048986bc560c5576355344005e6e7 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/ec/635144f60048986bc560c5576355344005e6e7 deleted file mode 100644 index 0207e4b4b..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/ec/635144f60048986bc560c5576355344005e6e7 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/f5/99e28b8ab0d8c9c57a486c89c4a5132dcbd3b2 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/f5/99e28b8ab0d8c9c57a486c89c4a5132dcbd3b2 deleted file mode 100644 index 674e37f3f..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/f5/99e28b8ab0d8c9c57a486c89c4a5132dcbd3b2 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/ff/231021500c7beb87de0d6d5edc29b6f9c000b1 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/ff/231021500c7beb87de0d6d5edc29b6f9c000b1 deleted file mode 100644 index b02c5baf8..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/ff/231021500c7beb87de0d6d5edc29b6f9c000b1 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/bisect/bad b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/bisect/bad deleted file mode 100644 index df35eff7a..000000000 --- a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/bisect/bad +++ /dev/null @@ -1 +0,0 @@ -10e171beacb963e4f8a4dc1d80fd291c135902bb diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/bisect/good-38242e5215bc35b3e418c1d6d63fd0291001e10b b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/bisect/good-38242e5215bc35b3e418c1d6d63fd0291001e10b deleted file mode 100644 index 365c8ad45..000000000 --- a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/bisect/good-38242e5215bc35b3e418c1d6d63fd0291001e10b +++ /dev/null @@ -1 +0,0 @@ -38242e5215bc35b3e418c1d6d63fd0291001e10b diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/bisect/good-3fbb9e626d4b7d30e58346b3eefaa342b15ab776 b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/bisect/good-3fbb9e626d4b7d30e58346b3eefaa342b15ab776 deleted file mode 100644 index bfb46ec3b..000000000 --- a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/bisect/good-3fbb9e626d4b7d30e58346b3eefaa342b15ab776 +++ /dev/null @@ -1 +0,0 @@ -3fbb9e626d4b7d30e58346b3eefaa342b15ab776 diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/heads/master b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/heads/master deleted file mode 100644 index bcec15ab4..000000000 --- a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -36903784186b1b8b4a150dc656eccd49f94e114e diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/heads/other b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/heads/other deleted file mode 100644 index d6f4abc86..000000000 --- a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/heads/other +++ /dev/null @@ -1 +0,0 @@ -e559f83c6e8dd11680de70b487725e37ff2e283f diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/heads/test b/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/heads/test deleted file mode 100644 index bcec15ab4..000000000 --- a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/heads/test +++ /dev/null @@ -1 +0,0 @@ -36903784186b1b8b4a150dc656eccd49f94e114e diff --git a/test/integration/bisectFromOtherBranch/expected/repo/myfile b/test/integration/bisectFromOtherBranch/expected/repo/myfile deleted file mode 100644 index e69de29bb..000000000 diff --git a/test/integration/bisectFromOtherBranch/recording.json b/test/integration/bisectFromOtherBranch/recording.json deleted file mode 100644 index c38fa7758..000000000 --- a/test/integration/bisectFromOtherBranch/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":661,"Mod":0,"Key":259,"Ch":0},{"Timestamp":925,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1238,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1398,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1535,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1677,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1823,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1941,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2261,"Mod":0,"Key":256,"Ch":98},{"Timestamp":2910,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3564,"Mod":0,"Key":256,"Ch":98},{"Timestamp":3949,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4214,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4869,"Mod":0,"Key":256,"Ch":98},{"Timestamp":5229,"Mod":0,"Key":257,"Ch":0},{"Timestamp":5582,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6590,"Mod":0,"Key":256,"Ch":98},{"Timestamp":7325,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9003,"Mod":0,"Key":27,"Ch":0},{"Timestamp":9341,"Mod":0,"Key":260,"Ch":0},{"Timestamp":10141,"Mod":0,"Key":256,"Ch":110},{"Timestamp":10413,"Mod":0,"Key":256,"Ch":116},{"Timestamp":10452,"Mod":0,"Key":256,"Ch":101},{"Timestamp":10629,"Mod":0,"Key":256,"Ch":115},{"Timestamp":10660,"Mod":0,"Key":256,"Ch":116},{"Timestamp":10854,"Mod":0,"Key":13,"Ch":13},{"Timestamp":11637,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/bisectFromOtherBranch/setup.sh b/test/integration/bisectFromOtherBranch/setup.sh deleted file mode 100644 index ef9eb932c..000000000 --- a/test/integration/bisectFromOtherBranch/setup.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -set -e - -cd $1 - -git init - -git config user.email "CI@example.com" -git config user.name "CI" - -touch myfile -git add myfile -git commit -m "first commit" - -git checkout -b other - -for i in {1..20} -do - echo "$i" > file - git add . - git commit -m "commit $i" -done - -git checkout master - -git bisect start other~2 other~13 diff --git a/test/integration/bisectFromOtherBranch/test.json b/test/integration/bisectFromOtherBranch/test.json deleted file mode 100644 index a5503ac83..000000000 --- a/test/integration/bisectFromOtherBranch/test.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "description": "Opening lazygit when bisect has been started from another branch. There's an issue where we don't reselect the current branch if we mark the current branch as bad so this test side-steps that problem", - "speed": 20 -} diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/COMMIT_EDITMSG new file mode 100644 index 000000000..7444ad06a --- /dev/null +++ b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/COMMIT_EDITMSG @@ -0,0 +1 @@ +commit 10 diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/FETCH_HEAD b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/FETCH_HEAD similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/repo/.git_keep/FETCH_HEAD rename to test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/FETCH_HEAD diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/HEAD b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/config b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/config similarity index 87% rename from test/integration/bisectFromOtherBranch/expected/repo/.git_keep/config rename to test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/config index 8ae104545..8a748ce32 100644 --- a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/config +++ b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/config @@ -8,3 +8,5 @@ [user] email = CI@example.com name = CI +[commit] + gpgSign = false diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/description b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/description similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/repo/.git_keep/description rename to test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/description diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/index b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/index new file mode 100644 index 000000000..65d675154 Binary files /dev/null and b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/index differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/info/exclude b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/info/exclude similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/repo/.git_keep/info/exclude rename to test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/info/exclude diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/logs/HEAD b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/logs/HEAD new file mode 100644 index 000000000..126602da3 --- /dev/null +++ b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/logs/HEAD @@ -0,0 +1,15 @@ +0000000000000000000000000000000000000000 5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d CI 1661161824 +1000 commit (initial): only commit on master +5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d 5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d CI 1661161824 +1000 checkout: moving from master to other +5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d e739ef9112312917b4fc678e40e2372cc8fda25f CI 1661161824 +1000 commit: commit 01 +e739ef9112312917b4fc678e40e2372cc8fda25f 0d4e099996a7c3dc58120cfe1ec34973b309d0e0 CI 1661161824 +1000 commit: commit 02 +0d4e099996a7c3dc58120cfe1ec34973b309d0e0 3a899150d167edb02f0ef2ab43bf446d23d90310 CI 1661161824 +1000 commit: commit 03 +3a899150d167edb02f0ef2ab43bf446d23d90310 7f8a9a8381ae3fe82a0c43385d3a5bb25cf90699 CI 1661161824 +1000 commit: commit 04 +7f8a9a8381ae3fe82a0c43385d3a5bb25cf90699 d4779d400f252d1de4e76ef79e3b4d554fffadb5 CI 1661161824 +1000 commit: commit 05 +d4779d400f252d1de4e76ef79e3b4d554fffadb5 41bffcc8f25d268518574e91483a55e66124574c CI 1661161824 +1000 commit: commit 06 +41bffcc8f25d268518574e91483a55e66124574c 5c9b8a0a95c49c1674753ad827246ce05965e7fe CI 1661161824 +1000 commit: commit 07 +5c9b8a0a95c49c1674753ad827246ce05965e7fe 9cdece2525ed2b34f940b168a2f628984468a8c6 CI 1661161824 +1000 commit: commit 08 +9cdece2525ed2b34f940b168a2f628984468a8c6 e4fca3fab85b7a477a2de101e917fe43538e0302 CI 1661161824 +1000 commit: commit 09 +e4fca3fab85b7a477a2de101e917fe43538e0302 dff71e43e297a66eb7ec85b7b95ece827751cdbd CI 1661161824 +1000 commit: commit 10 +dff71e43e297a66eb7ec85b7b95ece827751cdbd 5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d CI 1661161824 +1000 checkout: moving from other to master +5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d 5c9b8a0a95c49c1674753ad827246ce05965e7fe CI 1661161824 +1000 checkout: moving from master to 5c9b8a0a95c49c1674753ad827246ce05965e7fe +5c9b8a0a95c49c1674753ad827246ce05965e7fe 5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d CI 1661161825 +1000 checkout: moving from 5c9b8a0a95c49c1674753ad827246ce05965e7fe to master diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/logs/refs/heads/master b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/logs/refs/heads/master new file mode 100644 index 000000000..15063339e --- /dev/null +++ b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d CI 1661161824 +1000 commit (initial): only commit on master diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/logs/refs/heads/other b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/logs/refs/heads/other new file mode 100644 index 000000000..01da9e7bf --- /dev/null +++ b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/logs/refs/heads/other @@ -0,0 +1,11 @@ +0000000000000000000000000000000000000000 5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d CI 1661161824 +1000 branch: Created from HEAD +5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d e739ef9112312917b4fc678e40e2372cc8fda25f CI 1661161824 +1000 commit: commit 01 +e739ef9112312917b4fc678e40e2372cc8fda25f 0d4e099996a7c3dc58120cfe1ec34973b309d0e0 CI 1661161824 +1000 commit: commit 02 +0d4e099996a7c3dc58120cfe1ec34973b309d0e0 3a899150d167edb02f0ef2ab43bf446d23d90310 CI 1661161824 +1000 commit: commit 03 +3a899150d167edb02f0ef2ab43bf446d23d90310 7f8a9a8381ae3fe82a0c43385d3a5bb25cf90699 CI 1661161824 +1000 commit: commit 04 +7f8a9a8381ae3fe82a0c43385d3a5bb25cf90699 d4779d400f252d1de4e76ef79e3b4d554fffadb5 CI 1661161824 +1000 commit: commit 05 +d4779d400f252d1de4e76ef79e3b4d554fffadb5 41bffcc8f25d268518574e91483a55e66124574c CI 1661161824 +1000 commit: commit 06 +41bffcc8f25d268518574e91483a55e66124574c 5c9b8a0a95c49c1674753ad827246ce05965e7fe CI 1661161824 +1000 commit: commit 07 +5c9b8a0a95c49c1674753ad827246ce05965e7fe 9cdece2525ed2b34f940b168a2f628984468a8c6 CI 1661161824 +1000 commit: commit 08 +9cdece2525ed2b34f940b168a2f628984468a8c6 e4fca3fab85b7a477a2de101e917fe43538e0302 CI 1661161824 +1000 commit: commit 09 +e4fca3fab85b7a477a2de101e917fe43538e0302 dff71e43e297a66eb7ec85b7b95ece827751cdbd CI 1661161824 +1000 commit: commit 10 diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/06/47fe4b7302efbfb235b8f0681b592cc3389d36 b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/06/47fe4b7302efbfb235b8f0681b592cc3389d36 new file mode 100644 index 000000000..a8a2b586d Binary files /dev/null and b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/06/47fe4b7302efbfb235b8f0681b592cc3389d36 differ diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/08/90c7f8fa8d1c157f24c55a6b7783633d3cdc9c b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/08/90c7f8fa8d1c157f24c55a6b7783633d3cdc9c new file mode 100644 index 000000000..f3e747107 Binary files /dev/null and b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/08/90c7f8fa8d1c157f24c55a6b7783633d3cdc9c differ diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/0d/4e099996a7c3dc58120cfe1ec34973b309d0e0 b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/0d/4e099996a7c3dc58120cfe1ec34973b309d0e0 new file mode 100644 index 000000000..d3c3d523b Binary files /dev/null and b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/0d/4e099996a7c3dc58120cfe1ec34973b309d0e0 differ diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/17/8975c6c2d5a8d36f9337efdeaa280062b1ef7c b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/17/8975c6c2d5a8d36f9337efdeaa280062b1ef7c new file mode 100644 index 000000000..933e877a0 Binary files /dev/null and b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/17/8975c6c2d5a8d36f9337efdeaa280062b1ef7c differ diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/30/ad007c4cb09b175810e069b1b2b02ab0140857 b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/30/ad007c4cb09b175810e069b1b2b02ab0140857 new file mode 100644 index 000000000..9d7077433 Binary files /dev/null and b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/30/ad007c4cb09b175810e069b1b2b02ab0140857 differ diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/31/24e0ff5f45136ff296f998e3c3e207b3d1b6a8 b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/31/24e0ff5f45136ff296f998e3c3e207b3d1b6a8 new file mode 100644 index 000000000..dc002385b Binary files /dev/null and b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/31/24e0ff5f45136ff296f998e3c3e207b3d1b6a8 differ diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/35/da65f29bc0b48aa80bd3a02cff623cf4355fd3 b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/35/da65f29bc0b48aa80bd3a02cff623cf4355fd3 new file mode 100644 index 000000000..350af2800 Binary files /dev/null and b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/35/da65f29bc0b48aa80bd3a02cff623cf4355fd3 differ diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/37/6048ba8da4b619088a7f4a5df3f528fde41f1a b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/37/6048ba8da4b619088a7f4a5df3f528fde41f1a new file mode 100644 index 000000000..e8c48561b --- /dev/null +++ b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/37/6048ba8da4b619088a7f4a5df3f528fde41f1a @@ -0,0 +1,2 @@ +x+)JMU00`040031QHI50+(apu}QƝzAVeVϻM;>dHGkG vq-|m \-O!2t@C,#_뾦>< ȪL7,q"OY 2,=v[} *s* 5>fG<ܸipdU`Uj"6\2Ҡ׿LoUYU\MT?f?͏j9 +IXUSe3Mج8o)gI \ No newline at end of file diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/3a/899150d167edb02f0ef2ab43bf446d23d90310 b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/3a/899150d167edb02f0ef2ab43bf446d23d90310 new file mode 100644 index 000000000..0aa17a336 Binary files /dev/null and b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/3a/899150d167edb02f0ef2ab43bf446d23d90310 differ diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/3b/f868a389d0073e715e848f0ee33d71064539ca b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/3b/f868a389d0073e715e848f0ee33d71064539ca new file mode 100644 index 000000000..07b07e91f Binary files /dev/null and b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/3b/f868a389d0073e715e848f0ee33d71064539ca differ diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/41/bffcc8f25d268518574e91483a55e66124574c b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/41/bffcc8f25d268518574e91483a55e66124574c new file mode 100644 index 000000000..dff435fef Binary files /dev/null and b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/41/bffcc8f25d268518574e91483a55e66124574c differ diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/47/d78ad7a27fc7fe483389512ebf7ea34c5514bc b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/47/d78ad7a27fc7fe483389512ebf7ea34c5514bc new file mode 100644 index 000000000..c562d38cc Binary files /dev/null and b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/47/d78ad7a27fc7fe483389512ebf7ea34c5514bc differ diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 new file mode 100644 index 000000000..adf64119a Binary files /dev/null and b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 differ diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/50/d561270fcfcdc9afc85f6136f937c529accaaa b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/50/d561270fcfcdc9afc85f6136f937c529accaaa new file mode 100644 index 000000000..f11f051fc Binary files /dev/null and b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/50/d561270fcfcdc9afc85f6136f937c529accaaa differ diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/55/3197193920043fb04f3e39e825916990955204 b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/55/3197193920043fb04f3e39e825916990955204 new file mode 100644 index 000000000..ac90c394a Binary files /dev/null and b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/55/3197193920043fb04f3e39e825916990955204 differ diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/5c/9b8a0a95c49c1674753ad827246ce05965e7fe b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/5c/9b8a0a95c49c1674753ad827246ce05965e7fe new file mode 100644 index 000000000..e3947050d --- /dev/null +++ b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/5c/9b8a0a95c49c1674753ad827246ce05965e7fe @@ -0,0 +1,6 @@ +xA +1 @Q=E4mf@D) + +.<[|Y[{t) +'+r\PRuAr>z_lyWZE:*.2!S +:a`4Fta1y''Yp(.f1O`9 \ No newline at end of file diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/5f/80f6e6bd2410efe5b5f613adc5b4fcf50e930d b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/5f/80f6e6bd2410efe5b5f613adc5b4fcf50e930d new file mode 100644 index 000000000..bc33f27d9 --- /dev/null +++ b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/5f/80f6e6bd2410efe5b5f613adc5b4fcf50e930d @@ -0,0 +1,3 @@ +xA +0E]dC"BW=FNQtFnWM3.Tbja))# T8s +1.E˯v tw*jzg=]=ϹmO@ Њ2$ \ No newline at end of file diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/7f/8a9a8381ae3fe82a0c43385d3a5bb25cf90699 b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/7f/8a9a8381ae3fe82a0c43385d3a5bb25cf90699 new file mode 100644 index 000000000..0ba0a16ee Binary files /dev/null and b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/7f/8a9a8381ae3fe82a0c43385d3a5bb25cf90699 differ diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/8d/49129429cacbb6694f0290b3219e91a6f364cd b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/8d/49129429cacbb6694f0290b3219e91a6f364cd new file mode 100644 index 000000000..8d434f204 Binary files /dev/null and b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/8d/49129429cacbb6694f0290b3219e91a6f364cd differ diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/9c/dece2525ed2b34f940b168a2f628984468a8c6 b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/9c/dece2525ed2b34f940b168a2f628984468a8c6 new file mode 100644 index 000000000..cde683022 Binary files /dev/null and b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/9c/dece2525ed2b34f940b168a2f628984468a8c6 differ diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/a0/2c4b36b68df7081152282cf1aabcab7b24e69b b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/a0/2c4b36b68df7081152282cf1aabcab7b24e69b new file mode 100644 index 000000000..85866acd8 Binary files /dev/null and b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/a0/2c4b36b68df7081152282cf1aabcab7b24e69b differ diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/b3/ae51762cc5929b5c4f6b65e8ad14954144fe82 b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/b3/ae51762cc5929b5c4f6b65e8ad14954144fe82 new file mode 100644 index 000000000..7eacc86e0 --- /dev/null +++ b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/b3/ae51762cc5929b5c4f6b65e8ad14954144fe82 @@ -0,0 +1 @@ +x+)JMU060a040031QHI50+(apu}QƝzAVeVϻM;>dHGkG vq-|m \-O!2t@C,#_뾦>< ȪL7,q"OY 2,=v[} *s* 5>fG<ܸipdU`Uj"6\2Ҡ׿Lo4v5 \ No newline at end of file diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/bf/2b038a7c59d4db31a492793086fafec802ec2f b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/bf/2b038a7c59d4db31a492793086fafec802ec2f new file mode 100644 index 000000000..17f75bca5 Binary files /dev/null and b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/bf/2b038a7c59d4db31a492793086fafec802ec2f differ diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/c2/55cf4ef7fd5661a9d68b717243a978e42b05ac b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/c2/55cf4ef7fd5661a9d68b717243a978e42b05ac new file mode 100644 index 000000000..6ac1f71b1 Binary files /dev/null and b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/c2/55cf4ef7fd5661a9d68b717243a978e42b05ac differ diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/cf/b438e7991d830d830d58744b99cff451a9d07e b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/cf/b438e7991d830d830d58744b99cff451a9d07e new file mode 100644 index 000000000..f184b6b99 Binary files /dev/null and b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/cf/b438e7991d830d830d58744b99cff451a9d07e differ diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/d4/779d400f252d1de4e76ef79e3b4d554fffadb5 b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/d4/779d400f252d1de4e76ef79e3b4d554fffadb5 new file mode 100644 index 000000000..6034204c0 Binary files /dev/null and b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/d4/779d400f252d1de4e76ef79e3b4d554fffadb5 differ diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/df/f71e43e297a66eb7ec85b7b95ece827751cdbd b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/df/f71e43e297a66eb7ec85b7b95ece827751cdbd new file mode 100644 index 000000000..8397c76a9 Binary files /dev/null and b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/df/f71e43e297a66eb7ec85b7b95ece827751cdbd differ diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/e2/1978e5aaff3752bdeeb635c1667ec59c5bbde1 b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/e2/1978e5aaff3752bdeeb635c1667ec59c5bbde1 new file mode 100644 index 000000000..37f59fe0f Binary files /dev/null and b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/e2/1978e5aaff3752bdeeb635c1667ec59c5bbde1 differ diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/e4/fca3fab85b7a477a2de101e917fe43538e0302 b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/e4/fca3fab85b7a477a2de101e917fe43538e0302 new file mode 100644 index 000000000..96986d1b2 Binary files /dev/null and b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/e4/fca3fab85b7a477a2de101e917fe43538e0302 differ diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/e6/db1f58c2bb5ead41049a8ef3910360eead21e2 b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/e6/db1f58c2bb5ead41049a8ef3910360eead21e2 new file mode 100644 index 000000000..8bcfafeb6 Binary files /dev/null and b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/e6/db1f58c2bb5ead41049a8ef3910360eead21e2 differ diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/e7/39ef9112312917b4fc678e40e2372cc8fda25f b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/e7/39ef9112312917b4fc678e40e2372cc8fda25f new file mode 100644 index 000000000..205e4506c Binary files /dev/null and b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/e7/39ef9112312917b4fc678e40e2372cc8fda25f differ diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/f2/c01a881661486f147e47f5be82914c5d0c0030 b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/f2/c01a881661486f147e47f5be82914c5d0c0030 new file mode 100644 index 000000000..7e30b2e35 Binary files /dev/null and b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/f2/c01a881661486f147e47f5be82914c5d0c0030 differ diff --git a/test/integration/bisectFromOtherBranch/expected/repo/.git_keep/packed-refs b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/packed-refs similarity index 100% rename from test/integration/bisectFromOtherBranch/expected/repo/.git_keep/packed-refs rename to test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/packed-refs diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/refs/heads/master b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/refs/heads/master new file mode 100644 index 000000000..ff1c9baaa --- /dev/null +++ b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/refs/heads/master @@ -0,0 +1 @@ +5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d diff --git a/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/refs/heads/other b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/refs/heads/other new file mode 100644 index 000000000..9938cab9e --- /dev/null +++ b/test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/refs/heads/other @@ -0,0 +1 @@ +dff71e43e297a66eb7ec85b7b95ece827751cdbd