From 8cdfc6758fd7e57d8a592f470f9c38f04a8372d0 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Mon, 22 Aug 2022 19:52:05 +1000 Subject: [PATCH] add another bisect integration test --- pkg/integration/components/shell.go | 4 + .../tests/bisect/from_other_branch.go | 69 ++++++++++++++++++ pkg/integration/tests/tests.go | 1 + .../repo/.git_keep/BISECT_ANCESTORS_OK | 0 .../repo/.git_keep/BISECT_EXPECTED_REV | 1 - .../expected/repo/.git_keep/BISECT_LOG | 12 --- .../expected/repo/.git_keep/BISECT_NAMES | 1 - .../expected/repo/.git_keep/BISECT_START | 1 - .../expected/repo/.git_keep/BISECT_TERMS | 2 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 - .../expected/repo/.git_keep/HEAD | 1 - .../expected/repo/.git_keep/index | Bin 137 -> 0 bytes .../expected/repo/.git_keep/logs/HEAD | 28 ------- .../repo/.git_keep/logs/refs/heads/master | 1 - .../repo/.git_keep/logs/refs/heads/other | 21 ------ .../repo/.git_keep/logs/refs/heads/test | 1 - .../00/750edc07d6415dcc07ae0351e9397b0222b7ba | Bin 17 -> 0 bytes .../03/ecdaa424af1fdaeab1bd1852319652b9518f11 | Bin 76 -> 0 bytes .../04/a577be2858b8024716876aefe6b665a98e1e4f | Bin 76 -> 0 bytes .../05/57fc43da38567eae00831e9b385fd2cad22643 | Bin 76 -> 0 bytes .../0c/fbf08886fca9a91cb753ec8734c84fcbe52c9f | Bin 17 -> 0 bytes .../0d/1bbe8d012c8c070167a006a4898b525cfbd930 | Bin 76 -> 0 bytes .../0f/373801691c466240bd131d28b2168712b045ba | 3 - .../10/e171beacb963e4f8a4dc1d80fd291c135902bb | Bin 148 -> 0 bytes .../11/e4fd4011c9ed3800bb33b85580dd1d09f6aefd | Bin 147 -> 0 bytes .../15/d4c5b8608fe472fd224333e60d44ea826cc80e | Bin 147 -> 0 bytes .../1a/35564b85e24c96e647b477aaf8d35dcf0de84d | Bin 147 -> 0 bytes .../1a/b342c03b4226cca1c751dba71fa2df0e7d82ee | Bin 148 -> 0 bytes .../1e/8b314962144c26d5e0e50fd29d2ca327864913 | Bin 17 -> 0 bytes .../20/9e3ef4b6247ce746048d5711befda46206d235 | Bin 18 -> 0 bytes .../26/661287266e53bda69d8daa3aac1f714650f13c | Bin 76 -> 0 bytes .../30/68d0d730547aaa5b86dbfe638db83133ae1421 | Bin 146 -> 0 bytes .../31/df6c951dc82b75b11bc48836e780134a16e6ad | Bin 76 -> 0 bytes .../33/3ff293caf2d3216edf22e3f1df64d43a7e1311 | Bin 149 -> 0 bytes .../36/903784186b1b8b4a150dc656eccd49f94e114e | Bin 121 -> 0 bytes .../38/242e5215bc35b3e418c1d6d63fd0291001e10b | 2 - .../3a/05ed1ca9671bc362c7197eb09bddff040c9110 | Bin 76 -> 0 bytes .../3b/e94d6b1b1b3b63db9e412b2e788d08979bc176 | Bin 76 -> 0 bytes .../3c/032078a4a21c5c51d3c93d91717c1dabbb8cd0 | Bin 18 -> 0 bytes .../3f/bb9e626d4b7d30e58346b3eefaa342b15ab776 | Bin 147 -> 0 bytes .../3f/d9ad29c185eac6106cfa005a3aa594e21b9e06 | Bin 147 -> 0 bytes .../43/99b07bd31d1f58a0ff10b5434d5ff4f36e38fb | Bin 76 -> 0 bytes .../45/a4fb75db864000d01701c0f7a51864bd4daabf | Bin 17 -> 0 bytes .../48/082f72f087ce7e6fa75b9c41d7387daecd447b | Bin 18 -> 0 bytes .../4a/9e01012c736e5e0998b7184d9a54e8c610ed02 | Bin 77 -> 0 bytes .../54/93d27d38b9902cf28b1035c644bf470df76060 | Bin 147 -> 0 bytes .../60/d3b2f4a4cd5f1637eba020358bfe5ecb5edcf2 | Bin 18 -> 0 bytes .../6f/a769bf11bd9dc4ff4e85f4951950b0bc34326f | 3 - .../74/cd0e856d938eb6b665284c5485c00f87e20dc5 | Bin 51 -> 0 bytes .../7c/fd51ebd06287effcfdab241235305cb6439d40 | Bin 76 -> 0 bytes .../7e/d6ff82de6bcc2a78243fc9c54d3ef5ac14da69 | Bin 17 -> 0 bytes .../7f/8f011eb73d6043d2e6db9d2c101195ae2801f2 | Bin 17 -> 0 bytes .../83/51c19397f4fcd5238d10034fa7fa384f14d580 | Bin 18 -> 0 bytes .../88/8633a131a49f1b8981d70c13d666defed6ba15 | Bin 77 -> 0 bytes .../8b/0156bd25a1ecd82ef7c4c53e9d6d312bb6d403 | Bin 76 -> 0 bytes .../90/dfebd90b0a89766c39928f22901b8c02b51fda | 1 - .../98/d9bcb75a685dfbfd60f611c309410152935b3d | Bin 18 -> 0 bytes .../9c/836a5c3f513818d300b410f8cb3a2e3bbd42a1 | Bin 148 -> 0 bytes .../9d/33ec0915534bf6401be9412203697791e40a04 | 1 - .../b1/bd38b62a0800a4f6a80c34e21c5acffae52c7e | Bin 18 -> 0 bytes .../b2/970eba9fd8dba8655094dc38fb4ee50b9bf23e | Bin 148 -> 0 bytes .../b4/de3947675361a7770d29b8982c407b0ec6b2a0 | Bin 18 -> 0 bytes .../b6/14152a335aabd8b5daa2c6abccc9425eb14177 | 2 - .../b6/a7d89c68e0ca66e96a9a51892cc33db66fb8a3 | Bin 18 -> 0 bytes .../b8/626c4cff2849624fb67f87cd0ad72b163671ad | Bin 17 -> 0 bytes .../cd/c58c0f95a2313ded9185e102bc35253f6a1bed | Bin 76 -> 0 bytes .../d0/0491fd7e5bb6fa28c517a0bb32b8b506539d4d | Bin 17 -> 0 bytes .../d2/7a997859219951ecc95c351174c70ea0cf9d37 | 3 - .../d3/6e09d97bf2c1527118bde353ad64b157f8b269 | 1 - .../d4/e982570808a24722649e852a92bda5cf54c9dd | Bin 76 -> 0 bytes .../d6/b24041cf04154f8f902651969675021f4d93a5 | Bin 18 -> 0 bytes .../d8/4e0684b1038552d5c8d86e67398d634f77ad3b | Bin 148 -> 0 bytes .../da/8dacb2a073ebc2adeddceb3cc2b39b6c95c858 | Bin 76 -> 0 bytes .../db/76c03074879025735b647b825786a7b3fcfe7c | Bin 76 -> 0 bytes .../e5/59f83c6e8dd11680de70b487725e37ff2e283f | 3 - .../e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 | Bin 15 -> 0 bytes .../ec/635144f60048986bc560c5576355344005e6e7 | Bin 17 -> 0 bytes .../f5/99e28b8ab0d8c9c57a486c89c4a5132dcbd3b2 | Bin 18 -> 0 bytes .../ff/231021500c7beb87de0d6d5edc29b6f9c000b1 | Bin 147 -> 0 bytes .../expected/repo/.git_keep/refs/bisect/bad | 1 - ...d-38242e5215bc35b3e418c1d6d63fd0291001e10b | 1 - ...d-3fbb9e626d4b7d30e58346b3eefaa342b15ab776 | 1 - .../expected/repo/.git_keep/refs/heads/master | 1 - .../expected/repo/.git_keep/refs/heads/other | 1 - .../expected/repo/.git_keep/refs/heads/test | 1 - .../expected/repo/myfile | 0 .../bisectFromOtherBranch/recording.json | 1 - .../bisectFromOtherBranch/setup.sh | 27 ------- .../bisectFromOtherBranch/test.json | 4 - .../expected/repo/.git_keep/COMMIT_EDITMSG | 1 + .../expected/repo/.git_keep/FETCH_HEAD | 0 .../expected/repo/.git_keep/HEAD | 1 + .../expected/repo/.git_keep/config | 2 + .../expected/repo/.git_keep/description | 0 .../expected/repo/.git_keep/index | Bin 0 -> 65 bytes .../expected/repo/.git_keep/info/exclude | 0 .../expected/repo/.git_keep/logs/HEAD | 15 ++++ .../repo/.git_keep/logs/refs/heads/master | 1 + .../repo/.git_keep/logs/refs/heads/other | 11 +++ .../06/47fe4b7302efbfb235b8f0681b592cc3389d36 | Bin 0 -> 30 bytes .../08/90c7f8fa8d1c157f24c55a6b7783633d3cdc9c | Bin 0 -> 212 bytes .../0d/4e099996a7c3dc58120cfe1ec34973b309d0e0 | Bin 0 -> 148 bytes .../17/8975c6c2d5a8d36f9337efdeaa280062b1ef7c | Bin 0 -> 30 bytes .../30/ad007c4cb09b175810e069b1b2b02ab0140857 | Bin 0 -> 30 bytes .../31/24e0ff5f45136ff296f998e3c3e207b3d1b6a8 | Bin 0 -> 186 bytes .../35/da65f29bc0b48aa80bd3a02cff623cf4355fd3 | Bin 0 -> 133 bytes .../37/6048ba8da4b619088a7f4a5df3f528fde41f1a | 2 + .../3a/899150d167edb02f0ef2ab43bf446d23d90310 | Bin 0 -> 146 bytes .../3b/f868a389d0073e715e848f0ee33d71064539ca | Bin 0 -> 30 bytes .../41/bffcc8f25d268518574e91483a55e66124574c | Bin 0 -> 148 bytes .../47/d78ad7a27fc7fe483389512ebf7ea34c5514bc | Bin 0 -> 30 bytes .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 0 -> 15 bytes .../50/d561270fcfcdc9afc85f6136f937c529accaaa | Bin 0 -> 30 bytes .../55/3197193920043fb04f3e39e825916990955204 | Bin 0 -> 55 bytes .../5c/9b8a0a95c49c1674753ad827246ce05965e7fe | 6 ++ .../5f/80f6e6bd2410efe5b5f613adc5b4fcf50e930d | 3 + .../7f/8a9a8381ae3fe82a0c43385d3a5bb25cf90699 | Bin 0 -> 148 bytes .../8d/49129429cacbb6694f0290b3219e91a6f364cd | Bin 0 -> 30 bytes .../9c/dece2525ed2b34f940b168a2f628984468a8c6 | Bin 0 -> 148 bytes .../a0/2c4b36b68df7081152282cf1aabcab7b24e69b | Bin 0 -> 81 bytes .../b3/ae51762cc5929b5c4f6b65e8ad14954144fe82 | 1 + .../bf/2b038a7c59d4db31a492793086fafec802ec2f | Bin 0 -> 30 bytes .../c2/55cf4ef7fd5661a9d68b717243a978e42b05ac | Bin 0 -> 30 bytes .../cf/b438e7991d830d830d58744b99cff451a9d07e | Bin 0 -> 265 bytes .../d4/779d400f252d1de4e76ef79e3b4d554fffadb5 | Bin 0 -> 148 bytes .../df/f71e43e297a66eb7ec85b7b95ece827751cdbd | Bin 0 -> 148 bytes .../e2/1978e5aaff3752bdeeb635c1667ec59c5bbde1 | Bin 0 -> 160 bytes .../e4/fca3fab85b7a477a2de101e917fe43538e0302 | Bin 0 -> 148 bytes .../e6/db1f58c2bb5ead41049a8ef3910360eead21e2 | Bin 0 -> 108 bytes .../e7/39ef9112312917b4fc678e40e2372cc8fda25f | Bin 0 -> 147 bytes .../f2/c01a881661486f147e47f5be82914c5d0c0030 | Bin 0 -> 30 bytes .../expected/repo/.git_keep/packed-refs | 0 .../expected/repo/.git_keep/refs/heads/master | 1 + .../expected/repo/.git_keep/refs/heads/other | 1 + 134 files changed, 119 insertions(+), 127 deletions(-) create mode 100644 pkg/integration/tests/bisect/from_other_branch.go delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_ANCESTORS_OK delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_EXPECTED_REV delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_LOG delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_NAMES delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_START delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_TERMS delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/HEAD delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/index delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/logs/HEAD delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/logs/refs/heads/other delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/logs/refs/heads/test delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/00/750edc07d6415dcc07ae0351e9397b0222b7ba delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/03/ecdaa424af1fdaeab1bd1852319652b9518f11 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/04/a577be2858b8024716876aefe6b665a98e1e4f delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/05/57fc43da38567eae00831e9b385fd2cad22643 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/0c/fbf08886fca9a91cb753ec8734c84fcbe52c9f delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/0d/1bbe8d012c8c070167a006a4898b525cfbd930 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/0f/373801691c466240bd131d28b2168712b045ba delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/10/e171beacb963e4f8a4dc1d80fd291c135902bb delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/11/e4fd4011c9ed3800bb33b85580dd1d09f6aefd delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/15/d4c5b8608fe472fd224333e60d44ea826cc80e delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/1a/35564b85e24c96e647b477aaf8d35dcf0de84d delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/1a/b342c03b4226cca1c751dba71fa2df0e7d82ee delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/1e/8b314962144c26d5e0e50fd29d2ca327864913 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/20/9e3ef4b6247ce746048d5711befda46206d235 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/26/661287266e53bda69d8daa3aac1f714650f13c delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/30/68d0d730547aaa5b86dbfe638db83133ae1421 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/31/df6c951dc82b75b11bc48836e780134a16e6ad delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/33/3ff293caf2d3216edf22e3f1df64d43a7e1311 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/36/903784186b1b8b4a150dc656eccd49f94e114e delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/38/242e5215bc35b3e418c1d6d63fd0291001e10b delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3a/05ed1ca9671bc362c7197eb09bddff040c9110 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3b/e94d6b1b1b3b63db9e412b2e788d08979bc176 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3c/032078a4a21c5c51d3c93d91717c1dabbb8cd0 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3f/bb9e626d4b7d30e58346b3eefaa342b15ab776 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/3f/d9ad29c185eac6106cfa005a3aa594e21b9e06 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/43/99b07bd31d1f58a0ff10b5434d5ff4f36e38fb delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/45/a4fb75db864000d01701c0f7a51864bd4daabf delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/48/082f72f087ce7e6fa75b9c41d7387daecd447b delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/4a/9e01012c736e5e0998b7184d9a54e8c610ed02 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/54/93d27d38b9902cf28b1035c644bf470df76060 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/60/d3b2f4a4cd5f1637eba020358bfe5ecb5edcf2 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/6f/a769bf11bd9dc4ff4e85f4951950b0bc34326f delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/74/cd0e856d938eb6b665284c5485c00f87e20dc5 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/7c/fd51ebd06287effcfdab241235305cb6439d40 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/7e/d6ff82de6bcc2a78243fc9c54d3ef5ac14da69 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/7f/8f011eb73d6043d2e6db9d2c101195ae2801f2 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/83/51c19397f4fcd5238d10034fa7fa384f14d580 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/88/8633a131a49f1b8981d70c13d666defed6ba15 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/8b/0156bd25a1ecd82ef7c4c53e9d6d312bb6d403 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/90/dfebd90b0a89766c39928f22901b8c02b51fda delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/98/d9bcb75a685dfbfd60f611c309410152935b3d delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/9c/836a5c3f513818d300b410f8cb3a2e3bbd42a1 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/9d/33ec0915534bf6401be9412203697791e40a04 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b1/bd38b62a0800a4f6a80c34e21c5acffae52c7e delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b2/970eba9fd8dba8655094dc38fb4ee50b9bf23e delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b4/de3947675361a7770d29b8982c407b0ec6b2a0 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b6/14152a335aabd8b5daa2c6abccc9425eb14177 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b6/a7d89c68e0ca66e96a9a51892cc33db66fb8a3 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b8/626c4cff2849624fb67f87cd0ad72b163671ad delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/cd/c58c0f95a2313ded9185e102bc35253f6a1bed delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d0/0491fd7e5bb6fa28c517a0bb32b8b506539d4d delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d2/7a997859219951ecc95c351174c70ea0cf9d37 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d3/6e09d97bf2c1527118bde353ad64b157f8b269 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d4/e982570808a24722649e852a92bda5cf54c9dd delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d6/b24041cf04154f8f902651969675021f4d93a5 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d8/4e0684b1038552d5c8d86e67398d634f77ad3b delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/da/8dacb2a073ebc2adeddceb3cc2b39b6c95c858 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/db/76c03074879025735b647b825786a7b3fcfe7c delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/e5/59f83c6e8dd11680de70b487725e37ff2e283f delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/ec/635144f60048986bc560c5576355344005e6e7 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/f5/99e28b8ab0d8c9c57a486c89c4a5132dcbd3b2 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/ff/231021500c7beb87de0d6d5edc29b6f9c000b1 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/bisect/bad delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/bisect/good-38242e5215bc35b3e418c1d6d63fd0291001e10b delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/bisect/good-3fbb9e626d4b7d30e58346b3eefaa342b15ab776 delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/heads/master delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/heads/other delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/heads/test delete mode 100644 test/integration/bisectFromOtherBranch/expected/repo/myfile delete mode 100644 test/integration/bisectFromOtherBranch/recording.json delete mode 100644 test/integration/bisectFromOtherBranch/setup.sh delete mode 100644 test/integration/bisectFromOtherBranch/test.json create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/COMMIT_EDITMSG rename test/{integration/bisectFromOtherBranch => integration_new/bisect/from_other_branch}/expected/repo/.git_keep/FETCH_HEAD (100%) create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/HEAD rename test/{integration/bisectFromOtherBranch => integration_new/bisect/from_other_branch}/expected/repo/.git_keep/config (87%) rename test/{integration/bisectFromOtherBranch => integration_new/bisect/from_other_branch}/expected/repo/.git_keep/description (100%) create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/index rename test/{integration/bisectFromOtherBranch => integration_new/bisect/from_other_branch}/expected/repo/.git_keep/info/exclude (100%) create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/logs/HEAD create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/logs/refs/heads/master create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/logs/refs/heads/other create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/06/47fe4b7302efbfb235b8f0681b592cc3389d36 create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/08/90c7f8fa8d1c157f24c55a6b7783633d3cdc9c create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/0d/4e099996a7c3dc58120cfe1ec34973b309d0e0 create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/17/8975c6c2d5a8d36f9337efdeaa280062b1ef7c create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/30/ad007c4cb09b175810e069b1b2b02ab0140857 create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/31/24e0ff5f45136ff296f998e3c3e207b3d1b6a8 create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/35/da65f29bc0b48aa80bd3a02cff623cf4355fd3 create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/37/6048ba8da4b619088a7f4a5df3f528fde41f1a create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/3a/899150d167edb02f0ef2ab43bf446d23d90310 create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/3b/f868a389d0073e715e848f0ee33d71064539ca create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/41/bffcc8f25d268518574e91483a55e66124574c create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/47/d78ad7a27fc7fe483389512ebf7ea34c5514bc create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/50/d561270fcfcdc9afc85f6136f937c529accaaa create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/55/3197193920043fb04f3e39e825916990955204 create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/5c/9b8a0a95c49c1674753ad827246ce05965e7fe create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/5f/80f6e6bd2410efe5b5f613adc5b4fcf50e930d create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/7f/8a9a8381ae3fe82a0c43385d3a5bb25cf90699 create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/8d/49129429cacbb6694f0290b3219e91a6f364cd create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/9c/dece2525ed2b34f940b168a2f628984468a8c6 create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/a0/2c4b36b68df7081152282cf1aabcab7b24e69b create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/b3/ae51762cc5929b5c4f6b65e8ad14954144fe82 create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/bf/2b038a7c59d4db31a492793086fafec802ec2f create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/c2/55cf4ef7fd5661a9d68b717243a978e42b05ac create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/cf/b438e7991d830d830d58744b99cff451a9d07e create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/d4/779d400f252d1de4e76ef79e3b4d554fffadb5 create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/df/f71e43e297a66eb7ec85b7b95ece827751cdbd create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/e2/1978e5aaff3752bdeeb635c1667ec59c5bbde1 create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/e4/fca3fab85b7a477a2de101e917fe43538e0302 create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/e6/db1f58c2bb5ead41049a8ef3910360eead21e2 create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/e7/39ef9112312917b4fc678e40e2372cc8fda25f create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/objects/f2/c01a881661486f147e47f5be82914c5d0c0030 rename test/{integration/bisectFromOtherBranch => integration_new/bisect/from_other_branch}/expected/repo/.git_keep/packed-refs (100%) create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/refs/heads/master create mode 100644 test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/refs/heads/other 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 c469e6ea5f4096d9bb1a8b5449f62143b0a46ac9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 137 zcmZ?q402{*U|<4b#>5ZLS4fBT1%YVEUmwI785mfZG-~fMFf=X!N`D2a5dmU`XLBFT z-gNPrvv;@Vy7H(Sho1BVPh?=rtxU_zNd?J=1i88bDM{_{FqnAHp-20U^7tw 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 d3c45d51ea5d755dabd6e35ce0322533b264abdd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 YcmbHq)$ 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 355004b9ecfdaf84db14c525047e90a089f0b6f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 76 zcmV-S0JHyi0V^p=O;s>6V=y!@Ff%bxNXyJgW!RCF)K*wg=?Ym ixs_lQ&*nawz3JjLXYX#!b>&ev4n64!o(KTWJRSQQ*(7BE 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 da9396d18b519565de1b74100a8adf4f949ce5cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 76 zcmV-S0JHyi0V^p=O;s>6V=y!@Ff%bxNXyJgW!Q4h(mg#mad|nf=8hRU4%K|eHZ6e4 i=T?GMJe&Jy_NI&1oV~j>*Of=zIP|0^cp?DCt{vx}dm_C6 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 0ff3d683a82f9318d89e942addbc0a4ea1421b59..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 76 zcmV-S0JHyi0V^p=O;s>6V=y!@Ff%bxNXyJgWl)%B_hp+(&2u-F-f+Qvf0rb&T{4Br i=T?GMJe&Jy_NI&1oV~j>*Of=zIP|0^cp?DT3?4(k?;>&l 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 da246e1fe4dd7506e33985df613ec74645cf32b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 Ycmb6V=y!@Ff%bxNXyJgWvILMzv*7~8LbKx`;$j~?Y^!Nxs?f( i&#eTjcsBRZ>`fQ1IeT|&t}Bnaap*};@I(MCKOhO!ydil2 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 72e97d56143e3b7e5880862fcf3c3e69ada1a0ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gcW*3IZ_@Kw;~gVtPSl@-s<5MA&MNF-b-gjJqrmJic3a0Nck`yt?%M z7(kg1V^ak$S&@)zjgB=a=A25T1%+ym6DY$H(z3Ns3AGe#i`yz zoVSI7lo;8_d)$`|rWwxDeASQi^{J=2^a~JsM=_>Ea3n%Bd)=po{>gtH2+bE94LWXo Ctwpl{ 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 76c433f1ee70ab6fa6f7fbb7461c21b127efd642..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaA93c@fD06pgwxeKz}WRndP5qjz~HpvzRV@rwP^XTl+7@`0K@tio*KxN4_IWU{-`Z_{!M8Rh!9ehbagOAzAD6(*M zRLcTY*;ga)eqVPx&32sTn|`EiPra12T`dOhFh*vyXG8#V&||9WpZd?YWWM?;I&aP_ BM3Vpj 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 1bbb2bb68baeea545c2b6438086218dcf99532dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaA93c@fD06pgwxeKzp*(41V5qjz~HpvzRV@rwP^X6NOR)OY~T?L|laG z0vhW;sz%=ZzV3FK?KsUh{YcxMdMRtWS`6$k#$iBvMg%YiJ*K+;ssDUS<_nhbIq1o> BM1KGP 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 90434de85801ddcbcc680506cea4f2893956265a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gcW<3c@fDg<;n@#q0&?B$+gUB0^U^#!NCr!PrtFczm<)0B#@OgFkPz zJ{n-6Q#({)aGDFVx1LvA3o8ps!ARC&3S=b_#ud@*eCVrz1oTLjog-!`QK-Ld4lFt6 zq*=9JuggkImTiWH-$#B%h2aCWNIb@sQbS>;y zN~tz3(F$NirFXxtJ54i<(|nUpYTHvTWo=giTLbSy0G$D?)lrYBE`Rc$C#WyP{5kIM C=S6J* 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 f1722ae0044d12235bc5ca37b7e8d52b3303d02d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 YcmbeA0Lwu05+rq@Bjb+ 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 12e1f82f122993c9598b583241cad99aa966231d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18 Zcmbz~})JgFru1JODkq1=9ck 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 77e40c5af43f6756eb8ffde9e1c9a273347feea9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 76 zcmV-S0JHyi0V^p=O;s>6V=y!@Ff%bxNXyJgWw2pZs93T{CMNLmN!y8qHL|OB_gsL= i=T?GMJe&Jy_NI&1oV~j>*Of=zIP|0^cp?D9zaAybd?RQ8 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 8d4ae099919d55c7fb868c061a6fe1aca300889b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmV;D0B!$x0gaAJ3c@fH0A1%4*$eVs)1)sTB6Q_3-mfTFTS^3vZxD zD(sU5ez*Iw#qk!;6V=y!@Ff%bxNXyJgWteeu&-SQ{*x!E>z6l=YbYu*g9Bm7g i&#eTjcsBRZ>`fQ1IeT|&t}Bnaap*};@I(LxvL5!7;2{41 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 36368d1fc2e774010ea6d3dbf123b88f38f7d511..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmV;G0BZku0gaDA3c@fDMP26<*$Xn0NoS@YB6Q_3GHHr}v86=t_-5e&+&w;T@n2qR zeKe0FAKG4upG`Oefkc%N!XPvlM=|ZFoWy9!OOfohw3k=&u#k`f@`yPyhX^(!;T+Tg zvI+)+I9PJ&-R|q|r<*@dw`=*Nx;@J&ul3@QBcX_D@JB=d*Vlfkl|S{L-y_@?RDU@4 DnNCNI 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 abb03d100e97c328f4234aaa5bd09a96b4c396ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 121 zcmV-<0EYi~0ga783c@fD06pgwdlzK4%_b{|2tD-~?PiMwLnNlq=UeatUWXY*OU`Qp zVmh^I2GMIm6AtOxi_KvUfjjZaURV(qiPm9KcGK3LrNS`6Z5SW6Px<|_i""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 1ede294e1ab755fe8ca68c45a4a6cc08de9f2940..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 76 zcmV-S0JHyi0V^p=O;s>6V=y!@Ff%bxNXyJgWnd`fyTg9XG4>4mI_AKameov3+jl|b ib1T6rp3QwUd(*{h&feXc>&l~U9D33dJP`nuqa5n!#Utzh 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 00f0e017670c2d0c9ee4a4994d34458de210ee2e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 76 zcmV-S0JHyi0V^p=O;s>6V=y!@Ff%bxNXyJgW!SjaVw)BR!;)_+cuXG2M4kWjRHqIq ipIZr5@oes+*_$q2bN24mTvr}-+Y}TO#}b 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 ecdb2d612f7d882a44c9abe5dc8d59f9032ac286..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18 ZcmbV9Nt027x(DX#hd^25A5Q 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 34440506906eb68ddfc6af9deaafda1444db49e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gcW*3IZ_@Kw;~gVtPSl5+^?(B5bwCNG1~$jJqrmJic3a0Nck`JXv~w z44}k^v8jSo;V9S=XY0sSt%)Klp)KOrvTHt5(Q4Mb>1#l1J3~v1D4}SHp(<8iS*zGo zd`p6eg-m{r`?A3_!)2Op`pJEL>PeP<1@dP{A;d^9i;qXBZ-Qd}rYSq;`+uQL^;@ z7=WA(V^alRl|xGvcYIC0Rn~y6I;EVO%}iVcDVeow`Wnz26=uqj9WqB$5su;`A_XC< z#mbGFCsW?zzHBhfaGvI?eo9}TdXlAI08{Wt`@e%DqP1pU_o$(N>OUXQn=czcIyK8! BK}G-o 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 23915f2bc8f06a0e661308e696ff1e4d23164426..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 76 zcmV-S0JHyi0V^p=O;s>6V=y!@Ff%bxNXyJgWoQmOIC=V)KUbA|1(^Mp|FZBGx!M4g i&#eTjcsBRZ>`fQ1IeT|&t}Bnaap*};@I(LyZXYm*lpt~d 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 fdf2bc81d1e32f103ffac8e4afe9c1a2ff38c60a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 Ycmbz~m7VgTMr)1OPqU1=#=q 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 3b4ccc564783d5a50463d644e2f8a1a0b27533db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77 zcmV-T0J8sh0V^p=O;s>6V=y!@Ff%bxNXyJgW%xStQFqsd8z+xedE|5+St_i1`tl~I jd~PLJ#k0AOW^cN9&DpzKb6t7VjYCg*f+qq1XEz~Kxd9-k 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 166e5ee14d061e7625ac31a9e77ebedace8e8755..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaAJ3c@fDKwak)vlk@O$!7{8LRTJRGMS=aY$*{uzFl|#x9`2h)1|dX z2OQI(Z)QMP=cHrAsyvh&3u4j0Ovy5Pq#&3qNp-7i_UbU|t|ThW5s8s2d0zthnYEA% zMy1p+2s(N9`?A4wgY$H|+DF>@w39CF0+<3}&ddWG5xsXi-KVz~m_tgTOSVWB@(}1?2z$ 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 9888101455ffdc7410b4271ca3dfff619c4272ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 51 zcmbN$tS--9r`^A+@P()U2NwqC HeL|uD>30-* 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 8a6a651cabd069b134e5ccafe1cd4b07f8259801..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 76 zcmV-S0JHyi0V^p=O;s>6V=y!@Ff%bxNXyJgW$@t8FZ$4at}cIh^c=_Q7Pafnx>Q5u ib1T6rp3QwUd(*{h&feXc>&l~U9D33dJP`ottsc=Iyd_2e 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 637482d7a82554db2176cef4841bccc3141df169..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 Ycmbz~mtlgTNG~Bmh0*1>OJv 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 1c62650e27ecc52460141bf27de06c658029f918..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77 zcmV-T0J8sh0V^p=O;s>6V=y!@Ff%bxNXyJgW!Sd-#+-}?r_x?#%?j+)Ic&Qvf5&2| jd~PLJ#k0AOW^cN9&DpzKb6t7VjYCg*f+qq1O%ou+0U9Dk 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 f78367c1d2f726b5d815bda15726758235ab9a05..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 76 zcmV-S0JHyi0V^p=O;s>6V=y!@Ff%bxNXyJgWvK6Gl-q8b;C$)X?YTMvf>YONFn)r{ i=T?GMJe&Jy_NI&1oV~j>*Of=zIP|0^cp?D0tR1Kjfh6nz 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 f6e750c5d4d0d926ebc13a4aaee8f87c90e064bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18 Zcmbz~ng-gTO4NQ~*9A1?>O; 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 22a928539b7b990e1b7ccec0d6d049e911dabee3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gaAJ3c@fDKwak)vlk@OB$Ek<2wi!Md}dHEwv-4S-!43W+sEVa>eBmT z046$&O$3;koXhAi`=nSnF}7$cx<*7zR2r3x!K`_c*8tKSDHTO5Ew$=Zy>L*U0;XV# zE!BB9k(&G-_hp0m2Iu*9l~3;LQ%-g17eMk3V`QG-h-j_Z={_~&PyOfb9rFcE4LZI= CnnqUu 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 268d0f4596bcf2600c8598a88037be18713815f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18 Zcmbz~mVdgTN%FL;yYi1>gVx 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 e9a1d720b63f4d4f80a9c6f29728ec2e6cd380f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gcW<3c@fDKvCB@#q0%{=_F|aB0^UlW0K6EU~MT8Jic9c0JopF_;s1* zM+eIB&^J}^oO8jkG^R!tlAsx337&lmX5Kg|Co681OSIyz>x^i?RB5(`X~Q+An(4F_B$!L C97Br$ 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 6d65f13b4ba310fca2adfb687ac6239597dddfa1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18 Zcmbz~l)NgFqisJODl81=s)p 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 02dc6889120b0c2a240806b626b6a255b325ac62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18 Zcmbz~nI#gTM@?6aYQ{1?B(% 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 0761b6105a0c6d0e83d26edd1b1dddb94e8d9fdc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 Ycmb6V=y!@Ff%bxNXyJgWq6Yu=<&l~U9D33dJP`oi;~s7KsU%DQ 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 8dab6a9eaf1fff6a519dfb7bec1a5bdb56ff845d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 YcmbG7]ݭ<ơ'= 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 262f6ef1f2c9ad1980ac44ab73c1437b962c2c5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 76 zcmV-S0JHyi0V^p=O;s>6V=y!@Ff%bxNXyJgWpG{cyYzOO1H%Pz#slA%N~G-dU9}%7 ipIZr5@oes+*_$q2bN24mTvr}-V9OIG27!4@=>S3-25mdX8`9+r#-6apZd?Y0OkumbULXp CtVjC* 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 336fa799694e4a7e84711c0ff7f0bebea8087083..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 76 zcmV-S0JHyi0V^p=O;s>6V=y!@Ff%bxNXyJgWsvJO^h^@*QM>x!DgULpI*ZlYJcXh1 ixs_lQ&*nawz3JjLXYX#!b>&ev4n64!o(KS(;T;4E&m*t^ 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 b19f46c3de80eab61abe2182a0f572eb8de61379..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 76 zcmV-S0JHyi0V^p=O;s>6V=y!@Ff%bxNXyJgWw^G*Of=zIP|0^cp?C)A{{0Q@gu$f 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 711223894375fe1186ac5bfffdc48fb1fa1e65cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15 Wcmbz~liFgFp{c8~{DQ1Y$s`jH5xVLz@)=Puwv-4S-!43W+sAwG>eBmT z046?+O%2j8O#Ph 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 0000000000000000000000000000000000000000..65d675154f23ffb2d0196e017d44a5e7017550f5 GIT binary patch literal 65 zcmZ?q402{*U|<4bhL9jvS0E+HV4z^Y<=qr}%;|LA&IJiiy? 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 0000000000000000000000000000000000000000..a8a2b586df771ca14cecde7807a27ce30a6b580c GIT binary patch literal 30 mcmb+k8|g>J5cLD&o#S2XU literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f3e747107bb9d87ddf233fb1249f6677eb244de5 GIT binary patch literal 212 zcmV;_04x7^0V^p=O;s>5Gh;9`FfcPQQAo?oNi{IkE2$`9aKGMleNp}Ke;&r2fqMJv z7W;&X>_Jv#1Xji7{?EIZ>HYpqraL}lNJr`%wwP;%tjZXy%KAsf;?4`~c7<^*{d|vY z3)x&PPa&%^0jv6SK&nG5(Ia1^&i(7YrinhWJPZcNs!YME4uzig`~Ej9apkq{!XoFD z6;HHT*C4Ah1FI76EIoGU>Wa(xlg;1XTcyE}wDElnvMO`1DucBQH9i|=i$@4N$lSPT OgVqKSj&J}0IcDi5lxa!; literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d3c3d523b38f79c010bcdf4d73b85239a0b01e71 GIT binary patch literal 148 zcmV;F0Biqv0gcW<3c@fDKvCB@#q0&iOwvgLB0^U^#$=qJU~MT8Jic9c0JopF_`1yV zqXQN`^vw*!lg1jja=x|XGvYv$NgIk(m6|F=<5Jx!o4q<%3dLGMq<~Z~)!39%w&;yQ zBGue(LPK-%?)PPbaf0(WUF{?D`m~cS^97I@kug(*BYN-MUiYbPfAXIPPwop`5<0P8 CDoBa| literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..933e877a004be087db3ad361d41a016285123f23 GIT binary patch literal 30 mcmbJJ5vS2VYFfcPQQAo?oNi{IkE2$`9aKGMleNp}Ke;&r2fqMJv z7W;&X>_Jv#1Xji7{?EIZ>HYpqraL}lNJr`%wwP;%tjZXy%KAsf;?4`~c7<^*{d|vY z3)x&PPa&%^0jv6SK&nG5(Ia1^&i(7YrinhWJPZcNs!YME4uzig`~Ej9apkq{!XoFD o6;HHT*C4Ah1FI76EIoGU>Wa(xlg;1XTcyE}wDEln0K+a>>qpLC$N&HU literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..350af2800533c3104a701dce1729c5212dcef1f0 GIT binary patch literal 133 zcmV;00DAv;0V^p=O;s>7HDWL{FfcPQQAo?oNi{IkE2$`9aKGMleNp}Ke;&r2fqMJv z7W;&X>_Jv#1Xji7{?EIZ>HYpqraL}lNJr`%wwP;%tjZXy%KAsf;?4`~c7<^*{d|vY n3)x&PPa&%^0jv6SK&nG5(Ia1^&i(7YrinhWJPZZ^CcZiEHDN%H literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0aa17a3368304e87e7fdf8b6c7cd4324cf4fd7f8 GIT binary patch literal 146 zcmV;D0B!$x0gaAL3c@fH23_YAZ!gGuNtz~5MChu=$j?_4j4dUC$2SWP;4Ft(Ox|jJ zG?L&>?Ena_Bv}WabxH$bvBEY)kJSWW;~3p(fmVAw@M^@xfJHDyhrma>M* zEk-u8(rR?&-S5i=;|9? CWJcit literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c562d38cc74cf217a96352f3dc336a387371e749 GIT binary patch literal 30 mcmbsk8|g>J$%4di(1Z N`-F<@0RUnl5mQh97fApB literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0ba0a16ee06cbbb6992f073efcf4888e9b163205 GIT binary patch literal 148 zcmV;F0Biqv0gcW<3IZ_kLB$kMArzfZNYo{JQl1 z7#4Fpj7`K+XdHvOTq+cwm=lyn46dq1M^!zAppDGRo4kf4PB~+MhVd+|fKw24Ts#%^ zJ~l@!10fiGkNdLOX||VXzR8FC`jk^$`qg5Lh!KJU literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..cde6830222e5d92bbe4235f80dbd3558dee780a8 GIT binary patch literal 148 zcmV;F0Biqv0gcW<3c@fDg<;n@MfQSZ(##|SB0^U^#$=qLU~MT8Jib|Y0Jo3t!LRGG zJemilL)*=K9mEhaMOEa;6*bLN39ZNt5@UjtW-HNcvfHb9RIWvWaEGiwIb|H=R$`8c z)Bw_Oz3(%f$l`06~e#A0dR``r4zK{mFmchvL2x>N+Ga C9!h=y literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..85866acd897b150150557b0a331c827562ca4fa7 GIT binary patch literal 81 zcmV-X0IvUd0V^p=O;s>AV=y!@Ff%bxNXyJgH89jGsVHG^zut9yQT_3M9>$%4di(1Z n`-F<@K~`l1R>kK2&%2oE{r*j+J3eGcN9r85m}>?A;$I(9i#8>| literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..17f75bca502e6b34e2f231b56e520976da3a5221 GIT binary patch literal 30 mcmbJ9F=8+@FfcPQQAo?oNi{IkE2$`9aKGMleNp}Ke;&r2fqMJv z7W;&X>_Jv#1Xji7{?EIZ>HYpqraL}lNJr`%wwP;%tjZXy%KAsf;?4`~c7<^*{d|vY z3)x&PPa&%^0jv6SK&nG5(Ia1^&i(7YrinhWJPZcNs!YME4uzig`~Ej9apkq{!XoFD z6;HHT*C4Ah1FI76EIoGU>Wa(xlg;1XTcyE}wDElnvMO`1DucBQH9i|=i$@4N$lSPT zgVqKSj&NjE7GPETwVAtWBCp&wTr#QBpzYVc6HIUPkyTlORRvs4ROdf`_T>5#@rhH+yw3Zj*+lMPkXyIjgTmNH$Pz z#vukV4CtM{`+eD9yuo?AUG1au`n1!u%om`Ph!TlsI1(bdz3x-p{^UOogzgK83p(dH Cgh_Jv#1Xji7{?EIZ>HYpqraL}lNJr`%wwP;%tjZXy%KAsf;?4`~c7<^*{d|vY z3)x&PPa&%^0jv6SK&nG5(Ia1^&i(7YrinhWJPZcNs!YME4uzig`~Ej9apkq{!XoFD O6;HHT*8l*@%}K*azEJT1 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..96986d1b23d2ce708570d8324b14416fcc17af4f GIT binary patch literal 148 zcmV;F0Biqv0gaAL3c@fDMqTF=vlk?jPSP0=5xVLz@-sof*is^Re2aJh7au$xZ}H`& zwR;DYaOj&V7G+{6_FfcPQQAo?oNi{IkE2$`9aKGMleNp}Ke;&r2fqMJv z7W;&X>_Jv#1Xji7{?EIZ>HYpqraL}lNJr`%wwP;%tjZXy%KAsf;?4`~c7<^*{d|vY O3)x&PPXPdnMJ)ztA2U4w literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..205e4506cd441edd5f1745be772c6d24749a8891 GIT binary patch literal 147 zcmV;E0Brww0gcW<3c@fDKvCB@#q0%{NiwkmB0^U^Mv~5;U~DN7Jic9c0JopF_;qRR z(Sal#`lbrZf#ggQ#3ROF1)~KGqJw9lB!a^1F}gKx`s%J