diff --git a/pkg/commands/git_commands/bisect.go b/pkg/commands/git_commands/bisect.go index b032afc45..b09a50bf5 100644 --- a/pkg/commands/git_commands/bisect.go +++ b/pkg/commands/git_commands/bisect.go @@ -163,9 +163,12 @@ func (self *BisectCommands) IsDone() (bool, []string, error) { return done, candidates, nil } -func (self *BisectCommands) ReachableFromStart(ref string, startRef string) bool { +// tells us whether the 'start' ref that we'll be sent back to after we're done +// bisecting is actually a descendant of our current bisect commit. If it's not, we need to +// render the commits from the bad commit. +func (self *BisectCommands) ReachableFromStart(bisectInfo *BisectInfo) bool { err := self.cmd.New( - fmt.Sprintf("git merge-base --is-ancestor %s %s", startRef, ref), + fmt.Sprintf("git merge-base --is-ancestor %s %s", bisectInfo.GetNewSha(), bisectInfo.GetStartSha()), ).DontLog().Run() return err == nil diff --git a/pkg/commands/git_commands/bisect_info.go b/pkg/commands/git_commands/bisect_info.go index 9b812a17f..5b3b1f028 100644 --- a/pkg/commands/git_commands/bisect_info.go +++ b/pkg/commands/git_commands/bisect_info.go @@ -59,7 +59,7 @@ func (self *BisectInfo) GetCurrentSha() string { return self.current } -func (self *BisectInfo) StartSha() string { +func (self *BisectInfo) GetStartSha() string { return self.start } diff --git a/pkg/gui/bisect.go b/pkg/gui/bisect.go index ca00ce87f..5c46460ac 100644 --- a/pkg/gui/bisect.go +++ b/pkg/gui/bisect.go @@ -35,6 +35,9 @@ func (gui *Gui) openMidBisectMenu(info *git_commands.BisectInfo, commit *models. // they were talking about the selected commit or the current bisect commit, // and that was a bit confusing (and required extra keypresses). selectCurrentAfter := info.GetCurrentSha() == "" || info.GetCurrentSha() == commit.Sha + // we need to wait to reselect if our bisect commits aren't ancestors of our 'start' + // ref, because we'll be reloading our commits in that case. + waitToReselect := selectCurrentAfter && !gui.Git.Bisect.ReachableFromStart(info) menuItems := []*menuItem{ { @@ -45,7 +48,7 @@ func (gui *Gui) openMidBisectMenu(info *git_commands.BisectInfo, commit *models. return gui.surfaceError(err) } - return gui.afterMark(selectCurrentAfter) + return gui.afterMark(selectCurrentAfter, waitToReselect) }, }, { @@ -56,7 +59,7 @@ func (gui *Gui) openMidBisectMenu(info *git_commands.BisectInfo, commit *models. return gui.surfaceError(err) } - return gui.afterMark(selectCurrentAfter) + return gui.afterMark(selectCurrentAfter, waitToReselect) }, }, { @@ -67,7 +70,7 @@ func (gui *Gui) openMidBisectMenu(info *git_commands.BisectInfo, commit *models. return gui.surfaceError(err) } - return gui.afterMark(selectCurrentAfter) + return gui.afterMark(selectCurrentAfter, waitToReselect) }, }, { @@ -164,13 +167,13 @@ func (gui *Gui) showBisectCompleteMessage(candidateShas []string) error { }) } -func (gui *Gui) afterMark(selectCurrent bool) error { +func (gui *Gui) afterMark(selectCurrent bool, waitToReselect bool) error { done, candidateShas, err := gui.Git.Bisect.IsDone() if err != nil { return gui.surfaceError(err) } - if err := gui.postBisectCommandRefresh(); err != nil { + if err := gui.afterBisectMarkRefresh(selectCurrent, waitToReselect); err != nil { return gui.surfaceError(err) } @@ -178,11 +181,27 @@ func (gui *Gui) afterMark(selectCurrent bool) error { return gui.showBisectCompleteMessage(candidateShas) } - if selectCurrent { - gui.selectCurrentBisectCommit() + return nil +} + +func (gui *Gui) postBisectCommandRefresh() error { + return gui.refreshSidePanels(refreshOptions{mode: ASYNC, scope: []RefreshableView{}}) +} + +func (gui *Gui) afterBisectMarkRefresh(selectCurrent bool, waitToReselect bool) error { + selectFn := func() { + if selectCurrent { + gui.selectCurrentBisectCommit() + } } - return nil + if waitToReselect { + return gui.refreshSidePanels(refreshOptions{mode: SYNC, scope: []RefreshableView{}, then: selectFn}) + } else { + selectFn() + + return gui.postBisectCommandRefresh() + } } func (gui *Gui) selectCurrentBisectCommit() { @@ -198,7 +217,3 @@ func (gui *Gui) selectCurrentBisectCommit() { } } } - -func (gui *Gui) postBisectCommandRefresh() error { - return gui.refreshSidePanels(refreshOptions{mode: ASYNC, scope: []RefreshableView{}}) -} diff --git a/pkg/gui/commits_panel.go b/pkg/gui/commits_panel.go index 6e7ffb928..26015c069 100644 --- a/pkg/gui/commits_panel.go +++ b/pkg/gui/commits_panel.go @@ -141,12 +141,12 @@ func (gui *Gui) refForLog() string { return "HEAD" } - // need to see if our bisect's current commit is reachable from our 'start' ref. - if bisectInfo.Bisecting() && !gui.Git.Bisect.ReachableFromStart(bisectInfo.StartSha(), bisectInfo.GetCurrentSha()) { + // need to see if our bisect's current commit is reachable from our 'new' ref. + if bisectInfo.Bisecting() && !gui.Git.Bisect.ReachableFromStart(bisectInfo) { return bisectInfo.GetNewSha() } - return bisectInfo.StartSha() + return bisectInfo.GetStartSha() } func (gui *Gui) refreshRebaseCommits() error { diff --git a/test/integration/bisect/expected/.git_keep/BISECT_EXPECTED_REV b/test/integration/bisect/expected/.git_keep/BISECT_EXPECTED_REV index f8c370a35..aeb0e94fb 100644 --- a/test/integration/bisect/expected/.git_keep/BISECT_EXPECTED_REV +++ b/test/integration/bisect/expected/.git_keep/BISECT_EXPECTED_REV @@ -1 +1 @@ -dd9d90ed2d1fa5a284adba081199f18458977547 +e927f0f9467e772eea36f24053c9b534303b106a diff --git a/test/integration/bisect/expected/.git_keep/BISECT_LOG b/test/integration/bisect/expected/.git_keep/BISECT_LOG index 9d0807f9e..db4a771e2 100644 --- a/test/integration/bisect/expected/.git_keep/BISECT_LOG +++ b/test/integration/bisect/expected/.git_keep/BISECT_LOG @@ -1,16 +1,16 @@ git bisect start -# bad: [1e2780095cd8e95b93f89268f72cda21d528ab38] commit 19 -git bisect bad 1e2780095cd8e95b93f89268f72cda21d528ab38 -# good: [fbbb6006074afe8cc9009b649fae19f920b604ea] commit 10 -git bisect good fbbb6006074afe8cc9009b649fae19f920b604ea -# skip: [1b06712fea4c03c8fce8e2b3862c059f8d7f8268] commit 11 -git bisect skip 1b06712fea4c03c8fce8e2b3862c059f8d7f8268 -# skip: [ee930b55b61910c0830b0c6ea1cf9ada066d27fc] commit 12 -git bisect skip ee930b55b61910c0830b0c6ea1cf9ada066d27fc -# bad: [688bdfce6d5b16ebd7f5c6d6d5d68de7ea5344ed] commit 15 -git bisect bad 688bdfce6d5b16ebd7f5c6d6d5d68de7ea5344ed -# good: [ac324deab67f1749eeec1531b37dfaff41e559ca] commit 13 -git bisect good ac324deab67f1749eeec1531b37dfaff41e559ca -# bad: [dd9d90ed2d1fa5a284adba081199f18458977547] commit 14 -git bisect bad dd9d90ed2d1fa5a284adba081199f18458977547 -# first bad commit: [dd9d90ed2d1fa5a284adba081199f18458977547] commit 14 +# bad: [054bdf969fdcf1f90f1998666f628d40f72fde4f] commit 19 +git bisect bad 054bdf969fdcf1f90f1998666f628d40f72fde4f +# good: [39983ea412adebe6c5a3d4451a7673cf0962c472] commit 9 +git bisect good 39983ea412adebe6c5a3d4451a7673cf0962c472 +# good: [e9d2f825e793bc9ac2be698348dbe669bad34cad] commit 14 +git bisect good e9d2f825e793bc9ac2be698348dbe669bad34cad +# skip: [d1f7a85555fe6f10dd44754d35459ae741cb107c] commit 15 +git bisect skip d1f7a85555fe6f10dd44754d35459ae741cb107c +# skip: [bc21c8fabc28201fab6c60503168ecda25ad8626] commit 17 +git bisect skip bc21c8fabc28201fab6c60503168ecda25ad8626 +# good: [67fbfb3b74c2381ad1e058949231f2b4f0c8921f] commit 16 +git bisect good 67fbfb3b74c2381ad1e058949231f2b4f0c8921f +# good: [e927f0f9467e772eea36f24053c9b534303b106a] commit 18 +git bisect good e927f0f9467e772eea36f24053c9b534303b106a +# first bad commit: [054bdf969fdcf1f90f1998666f628d40f72fde4f] commit 19 diff --git a/test/integration/bisect/expected/.git_keep/index b/test/integration/bisect/expected/.git_keep/index index 61a57e2ef..2ad3e517b 100644 Binary files a/test/integration/bisect/expected/.git_keep/index and b/test/integration/bisect/expected/.git_keep/index differ diff --git a/test/integration/bisect/expected/.git_keep/logs/HEAD b/test/integration/bisect/expected/.git_keep/logs/HEAD index f336115a9..8f4ef5553 100644 --- a/test/integration/bisect/expected/.git_keep/logs/HEAD +++ b/test/integration/bisect/expected/.git_keep/logs/HEAD @@ -1,25 +1,24 @@ -0000000000000000000000000000000000000000 b7cd988a171f7f99b7e190ca2b46060074cb379a CI 1642807341 +1100 commit (initial): commit 1 -b7cd988a171f7f99b7e190ca2b46060074cb379a 810c10a66b1dabfe117eecdfb0f638bb1cd0ede5 CI 1642807341 +1100 commit: commit 2 -810c10a66b1dabfe117eecdfb0f638bb1cd0ede5 98c3099431a8777741ea114272919d6645418037 CI 1642807341 +1100 commit: commit 3 -98c3099431a8777741ea114272919d6645418037 f8174a4db5bb2082ebe73b29a47448a300fea7ae CI 1642807342 +1100 commit: commit 4 -f8174a4db5bb2082ebe73b29a47448a300fea7ae 305a009f27eb14858ea0a3a1a740a5346a543537 CI 1642807342 +1100 commit: commit 5 -305a009f27eb14858ea0a3a1a740a5346a543537 5530322be194fc9dea08ef86c9306bddeacb92db CI 1642807342 +1100 commit: commit 6 -5530322be194fc9dea08ef86c9306bddeacb92db 2cdabd5c24e74e22323744543a8ebcbfb33c7f6e CI 1642807342 +1100 commit: commit 7 -2cdabd5c24e74e22323744543a8ebcbfb33c7f6e 42fb40334713a02429d4f8d72f7fe7376caef15b CI 1642807342 +1100 commit: commit 8 -42fb40334713a02429d4f8d72f7fe7376caef15b 27584027b768a0d33ba92ad8784c09589de325b9 CI 1642807342 +1100 commit: commit 9 -27584027b768a0d33ba92ad8784c09589de325b9 fbbb6006074afe8cc9009b649fae19f920b604ea CI 1642807342 +1100 commit: commit 10 -fbbb6006074afe8cc9009b649fae19f920b604ea 1b06712fea4c03c8fce8e2b3862c059f8d7f8268 CI 1642807342 +1100 commit: commit 11 -1b06712fea4c03c8fce8e2b3862c059f8d7f8268 ee930b55b61910c0830b0c6ea1cf9ada066d27fc CI 1642807342 +1100 commit: commit 12 -ee930b55b61910c0830b0c6ea1cf9ada066d27fc ac324deab67f1749eeec1531b37dfaff41e559ca CI 1642807342 +1100 commit: commit 13 -ac324deab67f1749eeec1531b37dfaff41e559ca dd9d90ed2d1fa5a284adba081199f18458977547 CI 1642807342 +1100 commit: commit 14 -dd9d90ed2d1fa5a284adba081199f18458977547 688bdfce6d5b16ebd7f5c6d6d5d68de7ea5344ed CI 1642807342 +1100 commit: commit 15 -688bdfce6d5b16ebd7f5c6d6d5d68de7ea5344ed 2ce3bf88f382c762d97ac069eea18bed43a1bab2 CI 1642807342 +1100 commit: commit 16 -2ce3bf88f382c762d97ac069eea18bed43a1bab2 c09b924073b6a6cc1b2208f9a00f7b73bec2add2 CI 1642807342 +1100 commit: commit 17 -c09b924073b6a6cc1b2208f9a00f7b73bec2add2 12a951328c3156482355edebf6c81ded5480aff4 CI 1642807342 +1100 commit: commit 18 -12a951328c3156482355edebf6c81ded5480aff4 1e2780095cd8e95b93f89268f72cda21d528ab38 CI 1642807342 +1100 commit: commit 19 -1e2780095cd8e95b93f89268f72cda21d528ab38 1fd41e04d86ee95083d607da4e22abef9a570abc CI 1642807342 +1100 commit: commit 20 -1fd41e04d86ee95083d607da4e22abef9a570abc dd9d90ed2d1fa5a284adba081199f18458977547 CI 1642807346 +1100 checkout: moving from master to dd9d90ed2d1fa5a284adba081199f18458977547 -dd9d90ed2d1fa5a284adba081199f18458977547 688bdfce6d5b16ebd7f5c6d6d5d68de7ea5344ed CI 1642807348 +1100 checkout: moving from dd9d90ed2d1fa5a284adba081199f18458977547 to 688bdfce6d5b16ebd7f5c6d6d5d68de7ea5344ed -688bdfce6d5b16ebd7f5c6d6d5d68de7ea5344ed ac324deab67f1749eeec1531b37dfaff41e559ca CI 1642807352 +1100 checkout: moving from 688bdfce6d5b16ebd7f5c6d6d5d68de7ea5344ed to ac324deab67f1749eeec1531b37dfaff41e559ca -ac324deab67f1749eeec1531b37dfaff41e559ca dd9d90ed2d1fa5a284adba081199f18458977547 CI 1642807354 +1100 checkout: moving from ac324deab67f1749eeec1531b37dfaff41e559ca to dd9d90ed2d1fa5a284adba081199f18458977547 -dd9d90ed2d1fa5a284adba081199f18458977547 1fd41e04d86ee95083d607da4e22abef9a570abc CI 1642807358 +1100 checkout: moving from dd9d90ed2d1fa5a284adba081199f18458977547 to test +0000000000000000000000000000000000000000 005ca78c7fb8157683fa61158235b250d2316004 CI 1643185278 +1100 commit (initial): commit 1 +005ca78c7fb8157683fa61158235b250d2316004 d9328d9b2c9536fdf01641dd03f4a254d2c86601 CI 1643185278 +1100 commit: commit 2 +d9328d9b2c9536fdf01641dd03f4a254d2c86601 e59bbaffe94b06acaadab4245f30ff3e11c66e5b CI 1643185278 +1100 commit: commit 3 +e59bbaffe94b06acaadab4245f30ff3e11c66e5b 32e7b0308424a817ed5aa5bba94b06b72a1b8ce5 CI 1643185278 +1100 commit: commit 4 +32e7b0308424a817ed5aa5bba94b06b72a1b8ce5 96202a92c1d3bde1b20d6f3dec8e742d09732b4d CI 1643185278 +1100 commit: commit 5 +96202a92c1d3bde1b20d6f3dec8e742d09732b4d 82d721eb037f7045056023d0904989781ce1f526 CI 1643185278 +1100 commit: commit 6 +82d721eb037f7045056023d0904989781ce1f526 b97844c9437a4ab69c8165cadd97bc597b43135b CI 1643185278 +1100 commit: commit 7 +b97844c9437a4ab69c8165cadd97bc597b43135b ebe59a71e9750e75fb983f241687cdf7f0c8ce94 CI 1643185278 +1100 commit: commit 8 +ebe59a71e9750e75fb983f241687cdf7f0c8ce94 39983ea412adebe6c5a3d4451a7673cf0962c472 CI 1643185278 +1100 commit: commit 9 +39983ea412adebe6c5a3d4451a7673cf0962c472 dbb21289ee21b2ff0f3de2bc7d00038b30c4e353 CI 1643185278 +1100 commit: commit 10 +dbb21289ee21b2ff0f3de2bc7d00038b30c4e353 5f9397e5bcee1ac2a3fe6d834d42e36b74ef4ca8 CI 1643185278 +1100 commit: commit 11 +5f9397e5bcee1ac2a3fe6d834d42e36b74ef4ca8 267465454f74736bbe5b493c7f69dd3d024e26e5 CI 1643185278 +1100 commit: commit 12 +267465454f74736bbe5b493c7f69dd3d024e26e5 478a007451b33c7a234c60f0d13b164561b29094 CI 1643185278 +1100 commit: commit 13 +478a007451b33c7a234c60f0d13b164561b29094 e9d2f825e793bc9ac2be698348dbe669bad34cad CI 1643185278 +1100 commit: commit 14 +e9d2f825e793bc9ac2be698348dbe669bad34cad d1f7a85555fe6f10dd44754d35459ae741cb107c CI 1643185278 +1100 commit: commit 15 +d1f7a85555fe6f10dd44754d35459ae741cb107c 67fbfb3b74c2381ad1e058949231f2b4f0c8921f CI 1643185278 +1100 commit: commit 16 +67fbfb3b74c2381ad1e058949231f2b4f0c8921f bc21c8fabc28201fab6c60503168ecda25ad8626 CI 1643185278 +1100 commit: commit 17 +bc21c8fabc28201fab6c60503168ecda25ad8626 e927f0f9467e772eea36f24053c9b534303b106a CI 1643185278 +1100 commit: commit 18 +e927f0f9467e772eea36f24053c9b534303b106a 054bdf969fdcf1f90f1998666f628d40f72fde4f CI 1643185278 +1100 commit: commit 19 +054bdf969fdcf1f90f1998666f628d40f72fde4f 78d41b2abbd2f52c1ebf2f496268a915d59eb27b CI 1643185278 +1100 commit: commit 20 +78d41b2abbd2f52c1ebf2f496268a915d59eb27b e9d2f825e793bc9ac2be698348dbe669bad34cad CI 1643185283 +1100 checkout: moving from master to e9d2f825e793bc9ac2be698348dbe669bad34cad +e9d2f825e793bc9ac2be698348dbe669bad34cad 67fbfb3b74c2381ad1e058949231f2b4f0c8921f CI 1643185286 +1100 checkout: moving from e9d2f825e793bc9ac2be698348dbe669bad34cad to 67fbfb3b74c2381ad1e058949231f2b4f0c8921f +67fbfb3b74c2381ad1e058949231f2b4f0c8921f e927f0f9467e772eea36f24053c9b534303b106a CI 1643185295 +1100 checkout: moving from 67fbfb3b74c2381ad1e058949231f2b4f0c8921f to e927f0f9467e772eea36f24053c9b534303b106a +e927f0f9467e772eea36f24053c9b534303b106a 78d41b2abbd2f52c1ebf2f496268a915d59eb27b CI 1643185301 +1100 checkout: moving from e927f0f9467e772eea36f24053c9b534303b106a to test diff --git a/test/integration/bisect/expected/.git_keep/logs/refs/heads/master b/test/integration/bisect/expected/.git_keep/logs/refs/heads/master index 4ea0e17aa..61c607364 100644 --- a/test/integration/bisect/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/bisect/expected/.git_keep/logs/refs/heads/master @@ -1,20 +1,20 @@ -0000000000000000000000000000000000000000 b7cd988a171f7f99b7e190ca2b46060074cb379a CI 1642807341 +1100 commit (initial): commit 1 -b7cd988a171f7f99b7e190ca2b46060074cb379a 810c10a66b1dabfe117eecdfb0f638bb1cd0ede5 CI 1642807341 +1100 commit: commit 2 -810c10a66b1dabfe117eecdfb0f638bb1cd0ede5 98c3099431a8777741ea114272919d6645418037 CI 1642807341 +1100 commit: commit 3 -98c3099431a8777741ea114272919d6645418037 f8174a4db5bb2082ebe73b29a47448a300fea7ae CI 1642807342 +1100 commit: commit 4 -f8174a4db5bb2082ebe73b29a47448a300fea7ae 305a009f27eb14858ea0a3a1a740a5346a543537 CI 1642807342 +1100 commit: commit 5 -305a009f27eb14858ea0a3a1a740a5346a543537 5530322be194fc9dea08ef86c9306bddeacb92db CI 1642807342 +1100 commit: commit 6 -5530322be194fc9dea08ef86c9306bddeacb92db 2cdabd5c24e74e22323744543a8ebcbfb33c7f6e CI 1642807342 +1100 commit: commit 7 -2cdabd5c24e74e22323744543a8ebcbfb33c7f6e 42fb40334713a02429d4f8d72f7fe7376caef15b CI 1642807342 +1100 commit: commit 8 -42fb40334713a02429d4f8d72f7fe7376caef15b 27584027b768a0d33ba92ad8784c09589de325b9 CI 1642807342 +1100 commit: commit 9 -27584027b768a0d33ba92ad8784c09589de325b9 fbbb6006074afe8cc9009b649fae19f920b604ea CI 1642807342 +1100 commit: commit 10 -fbbb6006074afe8cc9009b649fae19f920b604ea 1b06712fea4c03c8fce8e2b3862c059f8d7f8268 CI 1642807342 +1100 commit: commit 11 -1b06712fea4c03c8fce8e2b3862c059f8d7f8268 ee930b55b61910c0830b0c6ea1cf9ada066d27fc CI 1642807342 +1100 commit: commit 12 -ee930b55b61910c0830b0c6ea1cf9ada066d27fc ac324deab67f1749eeec1531b37dfaff41e559ca CI 1642807342 +1100 commit: commit 13 -ac324deab67f1749eeec1531b37dfaff41e559ca dd9d90ed2d1fa5a284adba081199f18458977547 CI 1642807342 +1100 commit: commit 14 -dd9d90ed2d1fa5a284adba081199f18458977547 688bdfce6d5b16ebd7f5c6d6d5d68de7ea5344ed CI 1642807342 +1100 commit: commit 15 -688bdfce6d5b16ebd7f5c6d6d5d68de7ea5344ed 2ce3bf88f382c762d97ac069eea18bed43a1bab2 CI 1642807342 +1100 commit: commit 16 -2ce3bf88f382c762d97ac069eea18bed43a1bab2 c09b924073b6a6cc1b2208f9a00f7b73bec2add2 CI 1642807342 +1100 commit: commit 17 -c09b924073b6a6cc1b2208f9a00f7b73bec2add2 12a951328c3156482355edebf6c81ded5480aff4 CI 1642807342 +1100 commit: commit 18 -12a951328c3156482355edebf6c81ded5480aff4 1e2780095cd8e95b93f89268f72cda21d528ab38 CI 1642807342 +1100 commit: commit 19 -1e2780095cd8e95b93f89268f72cda21d528ab38 1fd41e04d86ee95083d607da4e22abef9a570abc CI 1642807342 +1100 commit: commit 20 +0000000000000000000000000000000000000000 005ca78c7fb8157683fa61158235b250d2316004 CI 1643185278 +1100 commit (initial): commit 1 +005ca78c7fb8157683fa61158235b250d2316004 d9328d9b2c9536fdf01641dd03f4a254d2c86601 CI 1643185278 +1100 commit: commit 2 +d9328d9b2c9536fdf01641dd03f4a254d2c86601 e59bbaffe94b06acaadab4245f30ff3e11c66e5b CI 1643185278 +1100 commit: commit 3 +e59bbaffe94b06acaadab4245f30ff3e11c66e5b 32e7b0308424a817ed5aa5bba94b06b72a1b8ce5 CI 1643185278 +1100 commit: commit 4 +32e7b0308424a817ed5aa5bba94b06b72a1b8ce5 96202a92c1d3bde1b20d6f3dec8e742d09732b4d CI 1643185278 +1100 commit: commit 5 +96202a92c1d3bde1b20d6f3dec8e742d09732b4d 82d721eb037f7045056023d0904989781ce1f526 CI 1643185278 +1100 commit: commit 6 +82d721eb037f7045056023d0904989781ce1f526 b97844c9437a4ab69c8165cadd97bc597b43135b CI 1643185278 +1100 commit: commit 7 +b97844c9437a4ab69c8165cadd97bc597b43135b ebe59a71e9750e75fb983f241687cdf7f0c8ce94 CI 1643185278 +1100 commit: commit 8 +ebe59a71e9750e75fb983f241687cdf7f0c8ce94 39983ea412adebe6c5a3d4451a7673cf0962c472 CI 1643185278 +1100 commit: commit 9 +39983ea412adebe6c5a3d4451a7673cf0962c472 dbb21289ee21b2ff0f3de2bc7d00038b30c4e353 CI 1643185278 +1100 commit: commit 10 +dbb21289ee21b2ff0f3de2bc7d00038b30c4e353 5f9397e5bcee1ac2a3fe6d834d42e36b74ef4ca8 CI 1643185278 +1100 commit: commit 11 +5f9397e5bcee1ac2a3fe6d834d42e36b74ef4ca8 267465454f74736bbe5b493c7f69dd3d024e26e5 CI 1643185278 +1100 commit: commit 12 +267465454f74736bbe5b493c7f69dd3d024e26e5 478a007451b33c7a234c60f0d13b164561b29094 CI 1643185278 +1100 commit: commit 13 +478a007451b33c7a234c60f0d13b164561b29094 e9d2f825e793bc9ac2be698348dbe669bad34cad CI 1643185278 +1100 commit: commit 14 +e9d2f825e793bc9ac2be698348dbe669bad34cad d1f7a85555fe6f10dd44754d35459ae741cb107c CI 1643185278 +1100 commit: commit 15 +d1f7a85555fe6f10dd44754d35459ae741cb107c 67fbfb3b74c2381ad1e058949231f2b4f0c8921f CI 1643185278 +1100 commit: commit 16 +67fbfb3b74c2381ad1e058949231f2b4f0c8921f bc21c8fabc28201fab6c60503168ecda25ad8626 CI 1643185278 +1100 commit: commit 17 +bc21c8fabc28201fab6c60503168ecda25ad8626 e927f0f9467e772eea36f24053c9b534303b106a CI 1643185278 +1100 commit: commit 18 +e927f0f9467e772eea36f24053c9b534303b106a 054bdf969fdcf1f90f1998666f628d40f72fde4f CI 1643185278 +1100 commit: commit 19 +054bdf969fdcf1f90f1998666f628d40f72fde4f 78d41b2abbd2f52c1ebf2f496268a915d59eb27b CI 1643185278 +1100 commit: commit 20 diff --git a/test/integration/bisect/expected/.git_keep/logs/refs/heads/test b/test/integration/bisect/expected/.git_keep/logs/refs/heads/test index 83f64a37e..a2526105f 100644 --- a/test/integration/bisect/expected/.git_keep/logs/refs/heads/test +++ b/test/integration/bisect/expected/.git_keep/logs/refs/heads/test @@ -1 +1 @@ -0000000000000000000000000000000000000000 1fd41e04d86ee95083d607da4e22abef9a570abc CI 1642807358 +1100 branch: Created from master +0000000000000000000000000000000000000000 78d41b2abbd2f52c1ebf2f496268a915d59eb27b CI 1643185301 +1100 branch: Created from master diff --git a/test/integration/bisect/expected/.git_keep/objects/00/5ca78c7fb8157683fa61158235b250d2316004 b/test/integration/bisect/expected/.git_keep/objects/00/5ca78c7fb8157683fa61158235b250d2316004 new file mode 100644 index 000000000..a22627c8d Binary files /dev/null and b/test/integration/bisect/expected/.git_keep/objects/00/5ca78c7fb8157683fa61158235b250d2316004 differ diff --git a/test/integration/bisect/expected/.git_keep/objects/05/4bdf969fdcf1f90f1998666f628d40f72fde4f b/test/integration/bisect/expected/.git_keep/objects/05/4bdf969fdcf1f90f1998666f628d40f72fde4f new file mode 100644 index 000000000..dd18604e8 --- /dev/null +++ b/test/integration/bisect/expected/.git_keep/objects/05/4bdf969fdcf1f90f1998666f628d40f72fde4f @@ -0,0 +1,2 @@ +xK +1D]?09FtP00Dfv{PU(CU!*%h-KcaG@f˻:hP&냆ylII7'VPn>ui4_SY[8D8!юQ]8a:E \ No newline at end of file diff --git a/test/integration/bisect/expected/.git_keep/objects/12/a951328c3156482355edebf6c81ded5480aff4 b/test/integration/bisect/expected/.git_keep/objects/12/a951328c3156482355edebf6c81ded5480aff4 deleted file mode 100644 index 4419e3037..000000000 --- a/test/integration/bisect/expected/.git_keep/objects/12/a951328c3156482355edebf6c81ded5480aff4 +++ /dev/null @@ -1,3 +0,0 @@ -xK -0@]d2U1LP,׬!z - QJ릺Mv{5_XkNIq9†T8yqqGi'](uO53;P \ No newline at end of file diff --git a/test/integration/bisect/expected/.git_keep/objects/82/d721eb037f7045056023d0904989781ce1f526 b/test/integration/bisect/expected/.git_keep/objects/82/d721eb037f7045056023d0904989781ce1f526 new file mode 100644 index 000000000..85c68ea1f Binary files /dev/null and b/test/integration/bisect/expected/.git_keep/objects/82/d721eb037f7045056023d0904989781ce1f526 differ diff --git a/test/integration/bisect/expected/.git_keep/objects/96/202a92c1d3bde1b20d6f3dec8e742d09732b4d b/test/integration/bisect/expected/.git_keep/objects/96/202a92c1d3bde1b20d6f3dec8e742d09732b4d new file mode 100644 index 000000000..059fc9c25 Binary files /dev/null and b/test/integration/bisect/expected/.git_keep/objects/96/202a92c1d3bde1b20d6f3dec8e742d09732b4d differ diff --git a/test/integration/bisect/expected/.git_keep/objects/98/c3099431a8777741ea114272919d6645418037 b/test/integration/bisect/expected/.git_keep/objects/98/c3099431a8777741ea114272919d6645418037 deleted file mode 100644 index 5d376c14c..000000000 Binary files a/test/integration/bisect/expected/.git_keep/objects/98/c3099431a8777741ea114272919d6645418037 and /dev/null differ diff --git a/test/integration/bisect/expected/.git_keep/objects/ac/324deab67f1749eeec1531b37dfaff41e559ca b/test/integration/bisect/expected/.git_keep/objects/ac/324deab67f1749eeec1531b37dfaff41e559ca deleted file mode 100644 index ee72d6df2..000000000 Binary files a/test/integration/bisect/expected/.git_keep/objects/ac/324deab67f1749eeec1531b37dfaff41e559ca and /dev/null differ diff --git a/test/integration/bisect/expected/.git_keep/objects/b7/cd988a171f7f99b7e190ca2b46060074cb379a b/test/integration/bisect/expected/.git_keep/objects/b7/cd988a171f7f99b7e190ca2b46060074cb379a deleted file mode 100644 index 2c359b84f..000000000 --- a/test/integration/bisect/expected/.git_keep/objects/b7/cd988a171f7f99b7e190ca2b46060074cb379a +++ /dev/null @@ -1,2 +0,0 @@ -xA - @Ѯ= Q'PB cԑ*`O=@?֞0UIԑ~pWRXd3}u-~-6RplWDkY?u-# \ No newline at end of file diff --git a/test/integration/bisect/expected/.git_keep/objects/b9/7844c9437a4ab69c8165cadd97bc597b43135b b/test/integration/bisect/expected/.git_keep/objects/b9/7844c9437a4ab69c8165cadd97bc597b43135b new file mode 100644 index 000000000..25e0f33f8 Binary files /dev/null and b/test/integration/bisect/expected/.git_keep/objects/b9/7844c9437a4ab69c8165cadd97bc597b43135b differ diff --git a/test/integration/bisect/expected/.git_keep/objects/bc/21c8fabc28201fab6c60503168ecda25ad8626 b/test/integration/bisect/expected/.git_keep/objects/bc/21c8fabc28201fab6c60503168ecda25ad8626 new file mode 100644 index 000000000..8751f1915 Binary files /dev/null and b/test/integration/bisect/expected/.git_keep/objects/bc/21c8fabc28201fab6c60503168ecda25ad8626 differ diff --git a/test/integration/bisect/expected/.git_keep/objects/c0/9b924073b6a6cc1b2208f9a00f7b73bec2add2 b/test/integration/bisect/expected/.git_keep/objects/c0/9b924073b6a6cc1b2208f9a00f7b73bec2add2 deleted file mode 100644 index 28a96df4f..000000000 Binary files a/test/integration/bisect/expected/.git_keep/objects/c0/9b924073b6a6cc1b2208f9a00f7b73bec2add2 and /dev/null differ diff --git a/test/integration/bisect/expected/.git_keep/objects/d1/f7a85555fe6f10dd44754d35459ae741cb107c b/test/integration/bisect/expected/.git_keep/objects/d1/f7a85555fe6f10dd44754d35459ae741cb107c new file mode 100644 index 000000000..017c9bf7e Binary files /dev/null and b/test/integration/bisect/expected/.git_keep/objects/d1/f7a85555fe6f10dd44754d35459ae741cb107c differ diff --git a/test/integration/bisect/expected/.git_keep/objects/d9/328d9b2c9536fdf01641dd03f4a254d2c86601 b/test/integration/bisect/expected/.git_keep/objects/d9/328d9b2c9536fdf01641dd03f4a254d2c86601 new file mode 100644 index 000000000..a2c2b4a5c Binary files /dev/null and b/test/integration/bisect/expected/.git_keep/objects/d9/328d9b2c9536fdf01641dd03f4a254d2c86601 differ diff --git a/test/integration/bisect/expected/.git_keep/objects/db/b21289ee21b2ff0f3de2bc7d00038b30c4e353 b/test/integration/bisect/expected/.git_keep/objects/db/b21289ee21b2ff0f3de2bc7d00038b30c4e353 new file mode 100644 index 000000000..e4e6a90b7 Binary files /dev/null and b/test/integration/bisect/expected/.git_keep/objects/db/b21289ee21b2ff0f3de2bc7d00038b30c4e353 differ diff --git a/test/integration/bisect/expected/.git_keep/objects/dd/9d90ed2d1fa5a284adba081199f18458977547 b/test/integration/bisect/expected/.git_keep/objects/dd/9d90ed2d1fa5a284adba081199f18458977547 deleted file mode 100644 index eb499d17c..000000000 Binary files a/test/integration/bisect/expected/.git_keep/objects/dd/9d90ed2d1fa5a284adba081199f18458977547 and /dev/null differ diff --git a/test/integration/bisect/expected/.git_keep/objects/e5/9bbaffe94b06acaadab4245f30ff3e11c66e5b b/test/integration/bisect/expected/.git_keep/objects/e5/9bbaffe94b06acaadab4245f30ff3e11c66e5b new file mode 100644 index 000000000..e69a0bf17 Binary files /dev/null and b/test/integration/bisect/expected/.git_keep/objects/e5/9bbaffe94b06acaadab4245f30ff3e11c66e5b differ diff --git a/test/integration/bisect/expected/.git_keep/objects/e9/27f0f9467e772eea36f24053c9b534303b106a b/test/integration/bisect/expected/.git_keep/objects/e9/27f0f9467e772eea36f24053c9b534303b106a new file mode 100644 index 000000000..b3ab8fa48 Binary files /dev/null and b/test/integration/bisect/expected/.git_keep/objects/e9/27f0f9467e772eea36f24053c9b534303b106a differ diff --git a/test/integration/bisect/expected/.git_keep/objects/e9/d2f825e793bc9ac2be698348dbe669bad34cad b/test/integration/bisect/expected/.git_keep/objects/e9/d2f825e793bc9ac2be698348dbe669bad34cad new file mode 100644 index 000000000..be6b5b0fa --- /dev/null +++ b/test/integration/bisect/expected/.git_keep/objects/e9/d2f825e793bc9ac2be698348dbe669bad34cad @@ -0,0 +1,4 @@ +xM +@ asLҤ## +-e,<ۗ/>$ +KDј,Hdc!O*If{y5`{#QR Igƒ` }}a^ 1643175915 +1100 commit (initial): first commit -3e94c347542e28f329499237920a81240575a1f4 3e94c347542e28f329499237920a81240575a1f4 CI 1643175915 +1100 checkout: moving from master to other -3e94c347542e28f329499237920a81240575a1f4 787e69fd95b7075de9290439e54677d023ea92c7 CI 1643175915 +1100 commit: commit 1 -787e69fd95b7075de9290439e54677d023ea92c7 847efa05018f2fbf9e8ad84c188829d9b7ebd4d5 CI 1643175915 +1100 commit: commit 2 -847efa05018f2fbf9e8ad84c188829d9b7ebd4d5 d2022605750ce8c6d2fd703df624fc1e191b799a CI 1643175915 +1100 commit: commit 3 -d2022605750ce8c6d2fd703df624fc1e191b799a 681e7676f6bd15140ad8d51345914d0b7fa69489 CI 1643175915 +1100 commit: commit 4 -681e7676f6bd15140ad8d51345914d0b7fa69489 3df063bdb2fd238bdf7bda23290b7da497589258 CI 1643175915 +1100 commit: commit 5 -3df063bdb2fd238bdf7bda23290b7da497589258 2d0d5709569edc32bd9ee891dc0645e7b7bf2061 CI 1643175915 +1100 commit: commit 6 -2d0d5709569edc32bd9ee891dc0645e7b7bf2061 9fb4f649e21a553f671bbd33c2ab4c5958c4d1b5 CI 1643175915 +1100 commit: commit 7 -9fb4f649e21a553f671bbd33c2ab4c5958c4d1b5 93feecfa069adae620503f0ea027c4d7d368efcc CI 1643175915 +1100 commit: commit 8 -93feecfa069adae620503f0ea027c4d7d368efcc 41f9560c3e0f5f8be63b4aef08706e8fbe54e1d3 CI 1643175915 +1100 commit: commit 9 -41f9560c3e0f5f8be63b4aef08706e8fbe54e1d3 d989cb769db41caf40f46f40aaa421568ee0d6bc CI 1643175915 +1100 commit: commit 10 -d989cb769db41caf40f46f40aaa421568ee0d6bc f59b0d2e37845a8d46ee072354598e8246f98324 CI 1643175915 +1100 commit: commit 11 -f59b0d2e37845a8d46ee072354598e8246f98324 304e25b1cbcd673476a98779d817b4d87feba619 CI 1643175915 +1100 commit: commit 12 -304e25b1cbcd673476a98779d817b4d87feba619 064b01d296b5d0a6d829b2c6da812000909144a3 CI 1643175915 +1100 commit: commit 13 -064b01d296b5d0a6d829b2c6da812000909144a3 72e695b433526c667e356788b961ebe192878531 CI 1643175915 +1100 commit: commit 14 -72e695b433526c667e356788b961ebe192878531 545ee64d47536092ef63907a18995827a74fa77d CI 1643175915 +1100 commit: commit 15 -545ee64d47536092ef63907a18995827a74fa77d be3e8df868feac07f915a39aaceb886aeca56442 CI 1643175915 +1100 commit: commit 16 -be3e8df868feac07f915a39aaceb886aeca56442 b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 CI 1643175915 +1100 commit: commit 17 -b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 96f59302fbb47e8abb38d110328500055c2eae8f CI 1643175915 +1100 commit: commit 18 -96f59302fbb47e8abb38d110328500055c2eae8f 96095b64429648b96e25b3a02a5ccd43c61cafef CI 1643175915 +1100 commit: commit 19 -96095b64429648b96e25b3a02a5ccd43c61cafef 0b148673b6c3595b97542fcd5b5e97a568ea26b0 CI 1643175915 +1100 commit: commit 20 -0b148673b6c3595b97542fcd5b5e97a568ea26b0 3e94c347542e28f329499237920a81240575a1f4 CI 1643175915 +1100 checkout: moving from other to master -3e94c347542e28f329499237920a81240575a1f4 545ee64d47536092ef63907a18995827a74fa77d CI 1643175915 +1100 checkout: moving from master to 545ee64d47536092ef63907a18995827a74fa77d -545ee64d47536092ef63907a18995827a74fa77d b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 CI 1643175918 +1100 checkout: moving from 545ee64d47536092ef63907a18995827a74fa77d to b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 -b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 3e94c347542e28f329499237920a81240575a1f4 CI 1643175923 +1100 checkout: moving from b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 to test +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/.git_keep/logs/refs/heads/master b/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/master index b89685177..4aff8c25b 100644 --- a/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/master +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/master @@ -1 +1 @@ -0000000000000000000000000000000000000000 3e94c347542e28f329499237920a81240575a1f4 CI 1643175915 +1100 commit (initial): first commit +0000000000000000000000000000000000000000 36903784186b1b8b4a150dc656eccd49f94e114e CI 1643177881 +1100 commit (initial): first commit diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/other b/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/other index 83bcfea8a..db03baa43 100644 --- a/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/other +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/other @@ -1,21 +1,21 @@ -0000000000000000000000000000000000000000 3e94c347542e28f329499237920a81240575a1f4 CI 1643175915 +1100 branch: Created from HEAD -3e94c347542e28f329499237920a81240575a1f4 787e69fd95b7075de9290439e54677d023ea92c7 CI 1643175915 +1100 commit: commit 1 -787e69fd95b7075de9290439e54677d023ea92c7 847efa05018f2fbf9e8ad84c188829d9b7ebd4d5 CI 1643175915 +1100 commit: commit 2 -847efa05018f2fbf9e8ad84c188829d9b7ebd4d5 d2022605750ce8c6d2fd703df624fc1e191b799a CI 1643175915 +1100 commit: commit 3 -d2022605750ce8c6d2fd703df624fc1e191b799a 681e7676f6bd15140ad8d51345914d0b7fa69489 CI 1643175915 +1100 commit: commit 4 -681e7676f6bd15140ad8d51345914d0b7fa69489 3df063bdb2fd238bdf7bda23290b7da497589258 CI 1643175915 +1100 commit: commit 5 -3df063bdb2fd238bdf7bda23290b7da497589258 2d0d5709569edc32bd9ee891dc0645e7b7bf2061 CI 1643175915 +1100 commit: commit 6 -2d0d5709569edc32bd9ee891dc0645e7b7bf2061 9fb4f649e21a553f671bbd33c2ab4c5958c4d1b5 CI 1643175915 +1100 commit: commit 7 -9fb4f649e21a553f671bbd33c2ab4c5958c4d1b5 93feecfa069adae620503f0ea027c4d7d368efcc CI 1643175915 +1100 commit: commit 8 -93feecfa069adae620503f0ea027c4d7d368efcc 41f9560c3e0f5f8be63b4aef08706e8fbe54e1d3 CI 1643175915 +1100 commit: commit 9 -41f9560c3e0f5f8be63b4aef08706e8fbe54e1d3 d989cb769db41caf40f46f40aaa421568ee0d6bc CI 1643175915 +1100 commit: commit 10 -d989cb769db41caf40f46f40aaa421568ee0d6bc f59b0d2e37845a8d46ee072354598e8246f98324 CI 1643175915 +1100 commit: commit 11 -f59b0d2e37845a8d46ee072354598e8246f98324 304e25b1cbcd673476a98779d817b4d87feba619 CI 1643175915 +1100 commit: commit 12 -304e25b1cbcd673476a98779d817b4d87feba619 064b01d296b5d0a6d829b2c6da812000909144a3 CI 1643175915 +1100 commit: commit 13 -064b01d296b5d0a6d829b2c6da812000909144a3 72e695b433526c667e356788b961ebe192878531 CI 1643175915 +1100 commit: commit 14 -72e695b433526c667e356788b961ebe192878531 545ee64d47536092ef63907a18995827a74fa77d CI 1643175915 +1100 commit: commit 15 -545ee64d47536092ef63907a18995827a74fa77d be3e8df868feac07f915a39aaceb886aeca56442 CI 1643175915 +1100 commit: commit 16 -be3e8df868feac07f915a39aaceb886aeca56442 b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 CI 1643175915 +1100 commit: commit 17 -b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 96f59302fbb47e8abb38d110328500055c2eae8f CI 1643175915 +1100 commit: commit 18 -96f59302fbb47e8abb38d110328500055c2eae8f 96095b64429648b96e25b3a02a5ccd43c61cafef CI 1643175915 +1100 commit: commit 19 -96095b64429648b96e25b3a02a5ccd43c61cafef 0b148673b6c3595b97542fcd5b5e97a568ea26b0 CI 1643175915 +1100 commit: commit 20 +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/.git_keep/logs/refs/heads/test b/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/test index 5b8c1f1cf..7ae7f188f 100644 --- a/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/test +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/test @@ -1 +1 @@ -0000000000000000000000000000000000000000 3e94c347542e28f329499237920a81240575a1f4 CI 1643175923 +1100 branch: Created from master +0000000000000000000000000000000000000000 36903784186b1b8b4a150dc656eccd49f94e114e CI 1643177893 +1100 branch: Created from master diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/06/4b01d296b5d0a6d829b2c6da812000909144a3 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/06/4b01d296b5d0a6d829b2c6da812000909144a3 deleted file mode 100644 index 41b1acb17..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/06/4b01d296b5d0a6d829b2c6da812000909144a3 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/0b/148673b6c3595b97542fcd5b5e97a568ea26b0 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/0b/148673b6c3595b97542fcd5b5e97a568ea26b0 deleted file mode 100644 index a0c03c19e..000000000 --- a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/0b/148673b6c3595b97542fcd5b5e97a568ea26b0 +++ /dev/null @@ -1,2 +0,0 @@ -xK -1]뙀0+tP00Df\֣x=:D8U #Mʊ8{) (x0L!DaΉGZ }ay]m{Iv;pьuDuS|":j \ No newline at end of file diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/0f/373801691c466240bd131d28b2168712b045ba b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/0f/373801691c466240bd131d28b2168712b045ba new file mode 100644 index 000000000..97cb55d14 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/0f/373801691c466240bd131d28b2168712b045ba @@ -0,0 +1,3 @@ +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/.git_keep/objects/10/e171beacb963e4f8a4dc1d80fd291c135902bb b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/10/e171beacb963e4f8a4dc1d80fd291c135902bb new file mode 100644 index 000000000..72e97d561 Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/10/e171beacb963e4f8a4dc1d80fd291c135902bb differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/11/e4fd4011c9ed3800bb33b85580dd1d09f6aefd b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/11/e4fd4011c9ed3800bb33b85580dd1d09f6aefd new file mode 100644 index 000000000..76c433f1e Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/11/e4fd4011c9ed3800bb33b85580dd1d09f6aefd differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/15/d4c5b8608fe472fd224333e60d44ea826cc80e b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/15/d4c5b8608fe472fd224333e60d44ea826cc80e new file mode 100644 index 000000000..1bbb2bb68 Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/15/d4c5b8608fe472fd224333e60d44ea826cc80e differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/1a/35564b85e24c96e647b477aaf8d35dcf0de84d b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/1a/35564b85e24c96e647b477aaf8d35dcf0de84d new file mode 100644 index 000000000..90434de85 Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/1a/35564b85e24c96e647b477aaf8d35dcf0de84d differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/1a/b342c03b4226cca1c751dba71fa2df0e7d82ee b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/1a/b342c03b4226cca1c751dba71fa2df0e7d82ee new file mode 100644 index 000000000..89ad61ab4 Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/1a/b342c03b4226cca1c751dba71fa2df0e7d82ee differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/2d/0d5709569edc32bd9ee891dc0645e7b7bf2061 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/2d/0d5709569edc32bd9ee891dc0645e7b7bf2061 deleted file mode 100644 index 8413068b9..000000000 --- a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/2d/0d5709569edc32bd9ee891dc0645e7b7bf2061 +++ /dev/null @@ -1,2 +0,0 @@ -x; -@@QbzAfs~ "2/(8&\)\W݅}3sJEIg4 5U1F`F) +mu Yf,sf%@ҹX*lnen>$Kr!c{ݧޥ Z""r:Y&ʄDb:y0eoy}ک-0GR޻S?}-: \ No newline at end of file diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3d/f063bdb2fd238bdf7bda23290b7da497589258 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3d/f063bdb2fd238bdf7bda23290b7da497589258 deleted file mode 100644 index baf2c1231..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3d/f063bdb2fd238bdf7bda23290b7da497589258 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3e/94c347542e28f329499237920a81240575a1f4 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3e/94c347542e28f329499237920a81240575a1f4 deleted file mode 100644 index e7ecc0e45..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3e/94c347542e28f329499237920a81240575a1f4 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3f/bb9e626d4b7d30e58346b3eefaa342b15ab776 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3f/bb9e626d4b7d30e58346b3eefaa342b15ab776 new file mode 100644 index 000000000..344405069 Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3f/bb9e626d4b7d30e58346b3eefaa342b15ab776 differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3f/d9ad29c185eac6106cfa005a3aa594e21b9e06 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3f/d9ad29c185eac6106cfa005a3aa594e21b9e06 new file mode 100644 index 000000000..f03b029ab Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3f/d9ad29c185eac6106cfa005a3aa594e21b9e06 differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/41/f9560c3e0f5f8be63b4aef08706e8fbe54e1d3 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/41/f9560c3e0f5f8be63b4aef08706e8fbe54e1d3 deleted file mode 100644 index 9cfa98a72..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/41/f9560c3e0f5f8be63b4aef08706e8fbe54e1d3 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/54/5ee64d47536092ef63907a18995827a74fa77d b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/54/5ee64d47536092ef63907a18995827a74fa77d deleted file mode 100644 index 2567c1e4f..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/54/5ee64d47536092ef63907a18995827a74fa77d and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/54/93d27d38b9902cf28b1035c644bf470df76060 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/54/93d27d38b9902cf28b1035c644bf470df76060 new file mode 100644 index 000000000..166e5ee14 Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/54/93d27d38b9902cf28b1035c644bf470df76060 differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/68/1e7676f6bd15140ad8d51345914d0b7fa69489 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/68/1e7676f6bd15140ad8d51345914d0b7fa69489 deleted file mode 100644 index 4e3661a61..000000000 --- a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/68/1e7676f6bd15140ad8d51345914d0b7fa69489 +++ /dev/null @@ -1,3 +0,0 @@ -xA -1 @Q=E4iNADH C,<[cSTO^**sʼna -L91N Ѭk@%K,GE*-o昒y||GSY0x25{ݧ2: \ No newline at end of file diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/6f/a769bf11bd9dc4ff4e85f4951950b0bc34326f b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/6f/a769bf11bd9dc4ff4e85f4951950b0bc34326f new file mode 100644 index 000000000..7f9ad8243 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/6f/a769bf11bd9dc4ff4e85f4951950b0bc34326f @@ -0,0 +1,3 @@ +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/.git_keep/objects/72/e695b433526c667e356788b961ebe192878531 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/72/e695b433526c667e356788b961ebe192878531 deleted file mode 100644 index d70ff6158..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/72/e695b433526c667e356788b961ebe192878531 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/78/7e69fd95b7075de9290439e54677d023ea92c7 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/78/7e69fd95b7075de9290439e54677d023ea92c7 deleted file mode 100644 index e8c75bad7..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/78/7e69fd95b7075de9290439e54677d023ea92c7 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/84/7efa05018f2fbf9e8ad84c188829d9b7ebd4d5 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/84/7efa05018f2fbf9e8ad84c188829d9b7ebd4d5 deleted file mode 100644 index 19c620158..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/84/7efa05018f2fbf9e8ad84c188829d9b7ebd4d5 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/93/feecfa069adae620503f0ea027c4d7d368efcc b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/93/feecfa069adae620503f0ea027c4d7d368efcc deleted file mode 100644 index c90ce22da..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/93/feecfa069adae620503f0ea027c4d7d368efcc and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/96/095b64429648b96e25b3a02a5ccd43c61cafef b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/96/095b64429648b96e25b3a02a5ccd43c61cafef deleted file mode 100644 index 2a3256196..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/96/095b64429648b96e25b3a02a5ccd43c61cafef and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/96/f59302fbb47e8abb38d110328500055c2eae8f b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/96/f59302fbb47e8abb38d110328500055c2eae8f deleted file mode 100644 index 69bd27609..000000000 --- a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/96/f59302fbb47e8abb38d110328500055c2eae8f +++ /dev/null @@ -1,2 +0,0 @@ -xA - E/GJ!cԑj.z|އ0ҩ"`Ml*Ll3V9]f!)f'Jlu5T=T)4.]jwo,+z)+ Mul; \ No newline at end of file diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/9c/836a5c3f513818d300b410f8cb3a2e3bbd42a1 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/9c/836a5c3f513818d300b410f8cb3a2e3bbd42a1 new file mode 100644 index 000000000..22a928539 Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/9c/836a5c3f513818d300b410f8cb3a2e3bbd42a1 differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/9f/b4f649e21a553f671bbd33c2ab4c5958c4d1b5 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/9f/b4f649e21a553f671bbd33c2ab4c5958c4d1b5 deleted file mode 100644 index 53eba54d8..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/9f/b4f649e21a553f671bbd33c2ab4c5958c4d1b5 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b2/970eba9fd8dba8655094dc38fb4ee50b9bf23e b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b2/970eba9fd8dba8655094dc38fb4ee50b9bf23e new file mode 100644 index 000000000..e9a1d720b Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b2/970eba9fd8dba8655094dc38fb4ee50b9bf23e differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b6/14152a335aabd8b5daa2c6abccc9425eb14177 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b6/14152a335aabd8b5daa2c6abccc9425eb14177 new file mode 100644 index 000000000..7e8fb3f28 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b6/14152a335aabd8b5daa2c6abccc9425eb14177 @@ -0,0 +1,2 @@ +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/.git_keep/objects/b9/c5ec23f6a30f26f7a742f01b8bbac17a5daf35 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b9/c5ec23f6a30f26f7a742f01b8bbac17a5daf35 deleted file mode 100644 index 75e56067d..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b9/c5ec23f6a30f26f7a742f01b8bbac17a5daf35 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/be/3e8df868feac07f915a39aaceb886aeca56442 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/be/3e8df868feac07f915a39aaceb886aeca56442 deleted file mode 100644 index 6cbaf038e..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/be/3e8df868feac07f915a39aaceb886aeca56442 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d2/022605750ce8c6d2fd703df624fc1e191b799a b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d2/022605750ce8c6d2fd703df624fc1e191b799a deleted file mode 100644 index e019fa50f..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d2/022605750ce8c6d2fd703df624fc1e191b799a and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d2/7a997859219951ecc95c351174c70ea0cf9d37 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d2/7a997859219951ecc95c351174c70ea0cf9d37 new file mode 100644 index 000000000..1efdcdbe0 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d2/7a997859219951ecc95c351174c70ea0cf9d37 @@ -0,0 +1,3 @@ +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/.git_keep/objects/d8/4e0684b1038552d5c8d86e67398d634f77ad3b b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d8/4e0684b1038552d5c8d86e67398d634f77ad3b new file mode 100644 index 000000000..4a21451f3 Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d8/4e0684b1038552d5c8d86e67398d634f77ad3b differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d9/89cb769db41caf40f46f40aaa421568ee0d6bc b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d9/89cb769db41caf40f46f40aaa421568ee0d6bc deleted file mode 100644 index 4c06d65f7..000000000 --- a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d9/89cb769db41caf40f46f40aaa421568ee0d6bc +++ /dev/null @@ -1,3 +0,0 @@ -xM -0]o/{?1 -Ɩۅp;G'wL`ac^Yb8a,<-xu2Ru\42&rjQɢUz487|R۞]ImKgfucO瓰:q \ No newline at end of file diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/e5/59f83c6e8dd11680de70b487725e37ff2e283f b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/e5/59f83c6e8dd11680de70b487725e37ff2e283f new file mode 100644 index 000000000..44afe2d13 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/e5/59f83c6e8dd11680de70b487725e37ff2e283f @@ -0,0 +1,3 @@ +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/.git_keep/objects/f5/9b0d2e37845a8d46ee072354598e8246f98324 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/f5/9b0d2e37845a8d46ee072354598e8246f98324 deleted file mode 100644 index b8fafea4f..000000000 Binary files a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/f5/9b0d2e37845a8d46ee072354598e8246f98324 and /dev/null differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/ff/231021500c7beb87de0d6d5edc29b6f9c000b1 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/ff/231021500c7beb87de0d6d5edc29b6f9c000b1 new file mode 100644 index 000000000..b02c5baf8 Binary files /dev/null and b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/ff/231021500c7beb87de0d6d5edc29b6f9c000b1 differ diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/bad b/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/bad index 461c04d68..df35eff7a 100644 --- a/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/bad +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/bad @@ -1 +1 @@ -96f59302fbb47e8abb38d110328500055c2eae8f +10e171beacb963e4f8a4dc1d80fd291c135902bb diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-064b01d296b5d0a6d829b2c6da812000909144a3 b/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-064b01d296b5d0a6d829b2c6da812000909144a3 deleted file mode 100644 index 37b4d53a7..000000000 --- a/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-064b01d296b5d0a6d829b2c6da812000909144a3 +++ /dev/null @@ -1 +0,0 @@ -064b01d296b5d0a6d829b2c6da812000909144a3 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-38242e5215bc35b3e418c1d6d63fd0291001e10b b/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-38242e5215bc35b3e418c1d6d63fd0291001e10b new file mode 100644 index 000000000..365c8ad45 --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-38242e5215bc35b3e418c1d6d63fd0291001e10b @@ -0,0 +1 @@ +38242e5215bc35b3e418c1d6d63fd0291001e10b diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-3fbb9e626d4b7d30e58346b3eefaa342b15ab776 b/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-3fbb9e626d4b7d30e58346b3eefaa342b15ab776 new file mode 100644 index 000000000..bfb46ec3b --- /dev/null +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-3fbb9e626d4b7d30e58346b3eefaa342b15ab776 @@ -0,0 +1 @@ +3fbb9e626d4b7d30e58346b3eefaa342b15ab776 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-545ee64d47536092ef63907a18995827a74fa77d b/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-545ee64d47536092ef63907a18995827a74fa77d deleted file mode 100644 index d9df07a69..000000000 --- a/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-545ee64d47536092ef63907a18995827a74fa77d +++ /dev/null @@ -1 +0,0 @@ -545ee64d47536092ef63907a18995827a74fa77d diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 b/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 deleted file mode 100644 index c86a4ce34..000000000 --- a/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 +++ /dev/null @@ -1 +0,0 @@ -b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/master b/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/master index 8467ab3ff..bcec15ab4 100644 --- a/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/master +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/master @@ -1 +1 @@ -3e94c347542e28f329499237920a81240575a1f4 +36903784186b1b8b4a150dc656eccd49f94e114e diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/other b/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/other index fbb2ee58a..d6f4abc86 100644 --- a/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/other +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/other @@ -1 +1 @@ -0b148673b6c3595b97542fcd5b5e97a568ea26b0 +e559f83c6e8dd11680de70b487725e37ff2e283f diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/test b/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/test index 8467ab3ff..bcec15ab4 100644 --- a/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/test +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/refs/heads/test @@ -1 +1 @@ -3e94c347542e28f329499237920a81240575a1f4 +36903784186b1b8b4a150dc656eccd49f94e114e diff --git a/test/integration/bisectFromOtherBranch/recording.json b/test/integration/bisectFromOtherBranch/recording.json index 453ad5417..c38fa7758 100644 --- a/test/integration/bisectFromOtherBranch/recording.json +++ b/test/integration/bisectFromOtherBranch/recording.json @@ -1 +1 @@ -{"KeyEvents":[{"Timestamp":611,"Mod":0,"Key":259,"Ch":0},{"Timestamp":754,"Mod":0,"Key":259,"Ch":0},{"Timestamp":947,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1098,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1202,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1545,"Mod":0,"Key":256,"Ch":98},{"Timestamp":1865,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2195,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2905,"Mod":0,"Key":256,"Ch":98},{"Timestamp":3499,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3866,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5556,"Mod":0,"Key":27,"Ch":0},{"Timestamp":5835,"Mod":0,"Key":260,"Ch":0},{"Timestamp":6850,"Mod":0,"Key":256,"Ch":110},{"Timestamp":7091,"Mod":0,"Key":256,"Ch":116},{"Timestamp":7146,"Mod":0,"Key":256,"Ch":101},{"Timestamp":7401,"Mod":0,"Key":256,"Ch":115},{"Timestamp":7441,"Mod":0,"Key":256,"Ch":116},{"Timestamp":7858,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9099,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file +{"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 index 73f0a0205..ef9eb932c 100644 --- a/test/integration/bisectFromOtherBranch/setup.sh +++ b/test/integration/bisectFromOtherBranch/setup.sh @@ -24,4 +24,4 @@ done git checkout master -git bisect start other~2 other~7 +git bisect start other~2 other~13