From 5a3f81d1f7a0c66572ea4044a5910cdf1954fefb Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 26 Jan 2022 19:12:44 +1100 Subject: [PATCH] select current bisect commit even if bisect was started on another branch --- pkg/commands/git_commands/bisect.go | 7 ++- pkg/commands/git_commands/bisect_info.go | 2 +- pkg/gui/bisect.go | 39 +++++++++---- pkg/gui/commits_panel.go | 6 +- .../expected/.git_keep/BISECT_EXPECTED_REV | 2 +- .../bisect/expected/.git_keep/BISECT_LOG | 30 +++++----- .../bisect/expected/.git_keep/index | Bin 137 -> 137 bytes .../bisect/expected/.git_keep/logs/HEAD | 49 ++++++++-------- .../expected/.git_keep/logs/refs/heads/master | 40 ++++++------- .../expected/.git_keep/logs/refs/heads/test | 2 +- .../00/5ca78c7fb8157683fa61158235b250d2316004 | Bin 0 -> 118 bytes .../05/4bdf969fdcf1f90f1998666f628d40f72fde4f | 2 + .../12/a951328c3156482355edebf6c81ded5480aff4 | 3 - .../1b/06712fea4c03c8fce8e2b3862c059f8d7f8268 | Bin 148 -> 0 bytes .../1e/2780095cd8e95b93f89268f72cda21d528ab38 | 2 - .../1f/d41e04d86ee95083d607da4e22abef9a570abc | Bin 148 -> 0 bytes .../26/7465454f74736bbe5b493c7f69dd3d024e26e5 | Bin 0 -> 147 bytes .../27/584027b768a0d33ba92ad8784c09589de325b9 | Bin 147 -> 0 bytes .../2c/dabd5c24e74e22323744543a8ebcbfb33c7f6e | Bin 148 -> 0 bytes .../2c/e3bf88f382c762d97ac069eea18bed43a1bab2 | 3 - .../30/5a009f27eb14858ea0a3a1a740a5346a543537 | Bin 146 -> 0 bytes .../32/e7b0308424a817ed5aa5bba94b06b72a1b8ce5 | Bin 0 -> 148 bytes .../39/983ea412adebe6c5a3d4451a7673cf0962c472 | 2 + .../42/fb40334713a02429d4f8d72f7fe7376caef15b | Bin 148 -> 0 bytes .../47/8a007451b33c7a234c60f0d13b164561b29094 | Bin 0 -> 148 bytes .../55/30322be194fc9dea08ef86c9306bddeacb92db | Bin 146 -> 0 bytes .../5f/9397e5bcee1ac2a3fe6d834d42e36b74ef4ca8 | Bin 0 -> 148 bytes .../67/fbfb3b74c2381ad1e058949231f2b4f0c8921f | Bin 0 -> 149 bytes .../68/8bdfce6d5b16ebd7f5c6d6d5d68de7ea5344ed | Bin 148 -> 0 bytes .../78/d41b2abbd2f52c1ebf2f496268a915d59eb27b | 2 + .../81/0c10a66b1dabfe117eecdfb0f638bb1cd0ede5 | 3 - .../82/d721eb037f7045056023d0904989781ce1f526 | Bin 0 -> 146 bytes .../96/202a92c1d3bde1b20d6f3dec8e742d09732b4d | Bin 0 -> 147 bytes .../98/c3099431a8777741ea114272919d6645418037 | Bin 147 -> 0 bytes .../ac/324deab67f1749eeec1531b37dfaff41e559ca | Bin 147 -> 0 bytes .../b7/cd988a171f7f99b7e190ca2b46060074cb379a | 2 - .../b9/7844c9437a4ab69c8165cadd97bc597b43135b | Bin 0 -> 147 bytes .../bc/21c8fabc28201fab6c60503168ecda25ad8626 | Bin 0 -> 148 bytes .../c0/9b924073b6a6cc1b2208f9a00f7b73bec2add2 | Bin 147 -> 0 bytes .../d1/f7a85555fe6f10dd44754d35459ae741cb107c | Bin 0 -> 149 bytes .../d9/328d9b2c9536fdf01641dd03f4a254d2c86601 | Bin 0 -> 148 bytes .../db/b21289ee21b2ff0f3de2bc7d00038b30c4e353 | Bin 0 -> 148 bytes .../dd/9d90ed2d1fa5a284adba081199f18458977547 | Bin 146 -> 0 bytes .../e5/9bbaffe94b06acaadab4245f30ff3e11c66e5b | Bin 0 -> 148 bytes .../e9/27f0f9467e772eea36f24053c9b534303b106a | Bin 0 -> 148 bytes .../e9/d2f825e793bc9ac2be698348dbe669bad34cad | 4 ++ .../eb/e59a71e9750e75fb983f241687cdf7f0c8ce94 | Bin 0 -> 148 bytes .../ee/930b55b61910c0830b0c6ea1cf9ada066d27fc | Bin 147 -> 0 bytes .../f8/174a4db5bb2082ebe73b29a47448a300fea7ae | Bin 145 -> 0 bytes .../fb/bb6006074afe8cc9009b649fae19f920b604ea | Bin 148 -> 0 bytes .../bisect/expected/.git_keep/refs/bisect/bad | 2 +- ...d-39983ea412adebe6c5a3d4451a7673cf0962c472 | 1 + ...d-67fbfb3b74c2381ad1e058949231f2b4f0c8921f | 1 + ...d-ac324deab67f1749eeec1531b37dfaff41e559ca | 1 - ...d-e927f0f9467e772eea36f24053c9b534303b106a | 1 + ...d-e9d2f825e793bc9ac2be698348dbe669bad34cad | 1 + ...d-fbbb6006074afe8cc9009b649fae19f920b604ea | 1 - ...p-1b06712fea4c03c8fce8e2b3862c059f8d7f8268 | 1 - ...p-bc21c8fabc28201fab6c60503168ecda25ad8626 | 1 + ...p-d1f7a85555fe6f10dd44754d35459ae741cb107c | 1 + ...p-ee930b55b61910c0830b0c6ea1cf9ada066d27fc | 1 - .../expected/.git_keep/refs/heads/master | 2 +- .../bisect/expected/.git_keep/refs/heads/test | 2 +- test/integration/bisect/recording.json | 2 +- test/integration/bisect/test.json | 2 +- .../expected/.git_keep/BISECT_EXPECTED_REV | 2 +- .../expected/.git_keep/BISECT_LOG | 20 ++++--- .../expected/.git_keep/index | Bin 137 -> 137 bytes .../expected/.git_keep/logs/HEAD | 54 +++++++++--------- .../expected/.git_keep/logs/refs/heads/master | 2 +- .../expected/.git_keep/logs/refs/heads/other | 42 +++++++------- .../expected/.git_keep/logs/refs/heads/test | 2 +- .../06/4b01d296b5d0a6d829b2c6da812000909144a3 | Bin 147 -> 0 bytes .../0b/148673b6c3595b97542fcd5b5e97a568ea26b0 | 2 - .../0f/373801691c466240bd131d28b2168712b045ba | 3 + .../10/e171beacb963e4f8a4dc1d80fd291c135902bb | Bin 0 -> 148 bytes .../11/e4fd4011c9ed3800bb33b85580dd1d09f6aefd | Bin 0 -> 147 bytes .../15/d4c5b8608fe472fd224333e60d44ea826cc80e | Bin 0 -> 147 bytes .../1a/35564b85e24c96e647b477aaf8d35dcf0de84d | Bin 0 -> 147 bytes .../1a/b342c03b4226cca1c751dba71fa2df0e7d82ee | Bin 0 -> 148 bytes .../2d/0d5709569edc32bd9ee891dc0645e7b7bf2061 | 2 - .../30/4e25b1cbcd673476a98779d817b4d87feba619 | Bin 148 -> 0 bytes .../30/68d0d730547aaa5b86dbfe638db83133ae1421 | Bin 0 -> 146 bytes .../33/3ff293caf2d3216edf22e3f1df64d43a7e1311 | Bin 0 -> 149 bytes .../36/903784186b1b8b4a150dc656eccd49f94e114e | Bin 0 -> 121 bytes .../38/242e5215bc35b3e418c1d6d63fd0291001e10b | 2 + .../3d/f063bdb2fd238bdf7bda23290b7da497589258 | Bin 147 -> 0 bytes .../3e/94c347542e28f329499237920a81240575a1f4 | Bin 121 -> 0 bytes .../3f/bb9e626d4b7d30e58346b3eefaa342b15ab776 | Bin 0 -> 147 bytes .../3f/d9ad29c185eac6106cfa005a3aa594e21b9e06 | Bin 0 -> 147 bytes .../41/f9560c3e0f5f8be63b4aef08706e8fbe54e1d3 | Bin 147 -> 0 bytes .../54/5ee64d47536092ef63907a18995827a74fa77d | Bin 147 -> 0 bytes .../54/93d27d38b9902cf28b1035c644bf470df76060 | Bin 0 -> 147 bytes .../68/1e7676f6bd15140ad8d51345914d0b7fa69489 | 3 - .../6f/a769bf11bd9dc4ff4e85f4951950b0bc34326f | 3 + .../72/e695b433526c667e356788b961ebe192878531 | Bin 149 -> 0 bytes .../78/7e69fd95b7075de9290439e54677d023ea92c7 | Bin 148 -> 0 bytes .../84/7efa05018f2fbf9e8ad84c188829d9b7ebd4d5 | Bin 146 -> 0 bytes .../93/feecfa069adae620503f0ea027c4d7d368efcc | Bin 148 -> 0 bytes .../96/095b64429648b96e25b3a02a5ccd43c61cafef | Bin 150 -> 0 bytes .../96/f59302fbb47e8abb38d110328500055c2eae8f | 2 - .../9c/836a5c3f513818d300b410f8cb3a2e3bbd42a1 | Bin 0 -> 148 bytes .../9f/b4f649e21a553f671bbd33c2ab4c5958c4d1b5 | Bin 148 -> 0 bytes .../b2/970eba9fd8dba8655094dc38fb4ee50b9bf23e | Bin 0 -> 148 bytes .../b6/14152a335aabd8b5daa2c6abccc9425eb14177 | 2 + .../b9/c5ec23f6a30f26f7a742f01b8bbac17a5daf35 | Bin 147 -> 0 bytes .../be/3e8df868feac07f915a39aaceb886aeca56442 | Bin 147 -> 0 bytes .../d2/022605750ce8c6d2fd703df624fc1e191b799a | Bin 148 -> 0 bytes .../d2/7a997859219951ecc95c351174c70ea0cf9d37 | 3 + .../d8/4e0684b1038552d5c8d86e67398d634f77ad3b | Bin 0 -> 148 bytes .../d9/89cb769db41caf40f46f40aaa421568ee0d6bc | 3 - .../e5/59f83c6e8dd11680de70b487725e37ff2e283f | 3 + .../f5/9b0d2e37845a8d46ee072354598e8246f98324 | Bin 147 -> 0 bytes .../ff/231021500c7beb87de0d6d5edc29b6f9c000b1 | Bin 0 -> 147 bytes .../expected/.git_keep/refs/bisect/bad | 2 +- ...d-064b01d296b5d0a6d829b2c6da812000909144a3 | 1 - ...d-38242e5215bc35b3e418c1d6d63fd0291001e10b | 1 + ...d-3fbb9e626d4b7d30e58346b3eefaa342b15ab776 | 1 + ...d-545ee64d47536092ef63907a18995827a74fa77d | 1 - ...d-b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 | 1 - .../expected/.git_keep/refs/heads/master | 2 +- .../expected/.git_keep/refs/heads/other | 2 +- .../expected/.git_keep/refs/heads/test | 2 +- .../bisectFromOtherBranch/recording.json | 2 +- .../bisectFromOtherBranch/setup.sh | 2 +- 125 files changed, 206 insertions(+), 181 deletions(-) create mode 100644 test/integration/bisect/expected/.git_keep/objects/00/5ca78c7fb8157683fa61158235b250d2316004 create mode 100644 test/integration/bisect/expected/.git_keep/objects/05/4bdf969fdcf1f90f1998666f628d40f72fde4f delete mode 100644 test/integration/bisect/expected/.git_keep/objects/12/a951328c3156482355edebf6c81ded5480aff4 delete mode 100644 test/integration/bisect/expected/.git_keep/objects/1b/06712fea4c03c8fce8e2b3862c059f8d7f8268 delete mode 100644 test/integration/bisect/expected/.git_keep/objects/1e/2780095cd8e95b93f89268f72cda21d528ab38 delete mode 100644 test/integration/bisect/expected/.git_keep/objects/1f/d41e04d86ee95083d607da4e22abef9a570abc create mode 100644 test/integration/bisect/expected/.git_keep/objects/26/7465454f74736bbe5b493c7f69dd3d024e26e5 delete mode 100644 test/integration/bisect/expected/.git_keep/objects/27/584027b768a0d33ba92ad8784c09589de325b9 delete mode 100644 test/integration/bisect/expected/.git_keep/objects/2c/dabd5c24e74e22323744543a8ebcbfb33c7f6e delete mode 100644 test/integration/bisect/expected/.git_keep/objects/2c/e3bf88f382c762d97ac069eea18bed43a1bab2 delete mode 100644 test/integration/bisect/expected/.git_keep/objects/30/5a009f27eb14858ea0a3a1a740a5346a543537 create mode 100644 test/integration/bisect/expected/.git_keep/objects/32/e7b0308424a817ed5aa5bba94b06b72a1b8ce5 create mode 100644 test/integration/bisect/expected/.git_keep/objects/39/983ea412adebe6c5a3d4451a7673cf0962c472 delete mode 100644 test/integration/bisect/expected/.git_keep/objects/42/fb40334713a02429d4f8d72f7fe7376caef15b create mode 100644 test/integration/bisect/expected/.git_keep/objects/47/8a007451b33c7a234c60f0d13b164561b29094 delete mode 100644 test/integration/bisect/expected/.git_keep/objects/55/30322be194fc9dea08ef86c9306bddeacb92db create mode 100644 test/integration/bisect/expected/.git_keep/objects/5f/9397e5bcee1ac2a3fe6d834d42e36b74ef4ca8 create mode 100644 test/integration/bisect/expected/.git_keep/objects/67/fbfb3b74c2381ad1e058949231f2b4f0c8921f delete mode 100644 test/integration/bisect/expected/.git_keep/objects/68/8bdfce6d5b16ebd7f5c6d6d5d68de7ea5344ed create mode 100644 test/integration/bisect/expected/.git_keep/objects/78/d41b2abbd2f52c1ebf2f496268a915d59eb27b delete mode 100644 test/integration/bisect/expected/.git_keep/objects/81/0c10a66b1dabfe117eecdfb0f638bb1cd0ede5 create mode 100644 test/integration/bisect/expected/.git_keep/objects/82/d721eb037f7045056023d0904989781ce1f526 create mode 100644 test/integration/bisect/expected/.git_keep/objects/96/202a92c1d3bde1b20d6f3dec8e742d09732b4d delete mode 100644 test/integration/bisect/expected/.git_keep/objects/98/c3099431a8777741ea114272919d6645418037 delete mode 100644 test/integration/bisect/expected/.git_keep/objects/ac/324deab67f1749eeec1531b37dfaff41e559ca delete mode 100644 test/integration/bisect/expected/.git_keep/objects/b7/cd988a171f7f99b7e190ca2b46060074cb379a create mode 100644 test/integration/bisect/expected/.git_keep/objects/b9/7844c9437a4ab69c8165cadd97bc597b43135b create mode 100644 test/integration/bisect/expected/.git_keep/objects/bc/21c8fabc28201fab6c60503168ecda25ad8626 delete mode 100644 test/integration/bisect/expected/.git_keep/objects/c0/9b924073b6a6cc1b2208f9a00f7b73bec2add2 create mode 100644 test/integration/bisect/expected/.git_keep/objects/d1/f7a85555fe6f10dd44754d35459ae741cb107c create mode 100644 test/integration/bisect/expected/.git_keep/objects/d9/328d9b2c9536fdf01641dd03f4a254d2c86601 create mode 100644 test/integration/bisect/expected/.git_keep/objects/db/b21289ee21b2ff0f3de2bc7d00038b30c4e353 delete mode 100644 test/integration/bisect/expected/.git_keep/objects/dd/9d90ed2d1fa5a284adba081199f18458977547 create mode 100644 test/integration/bisect/expected/.git_keep/objects/e5/9bbaffe94b06acaadab4245f30ff3e11c66e5b create mode 100644 test/integration/bisect/expected/.git_keep/objects/e9/27f0f9467e772eea36f24053c9b534303b106a create mode 100644 test/integration/bisect/expected/.git_keep/objects/e9/d2f825e793bc9ac2be698348dbe669bad34cad create mode 100644 test/integration/bisect/expected/.git_keep/objects/eb/e59a71e9750e75fb983f241687cdf7f0c8ce94 delete mode 100644 test/integration/bisect/expected/.git_keep/objects/ee/930b55b61910c0830b0c6ea1cf9ada066d27fc delete mode 100644 test/integration/bisect/expected/.git_keep/objects/f8/174a4db5bb2082ebe73b29a47448a300fea7ae delete mode 100644 test/integration/bisect/expected/.git_keep/objects/fb/bb6006074afe8cc9009b649fae19f920b604ea create mode 100644 test/integration/bisect/expected/.git_keep/refs/bisect/good-39983ea412adebe6c5a3d4451a7673cf0962c472 create mode 100644 test/integration/bisect/expected/.git_keep/refs/bisect/good-67fbfb3b74c2381ad1e058949231f2b4f0c8921f delete mode 100644 test/integration/bisect/expected/.git_keep/refs/bisect/good-ac324deab67f1749eeec1531b37dfaff41e559ca create mode 100644 test/integration/bisect/expected/.git_keep/refs/bisect/good-e927f0f9467e772eea36f24053c9b534303b106a create mode 100644 test/integration/bisect/expected/.git_keep/refs/bisect/good-e9d2f825e793bc9ac2be698348dbe669bad34cad delete mode 100644 test/integration/bisect/expected/.git_keep/refs/bisect/good-fbbb6006074afe8cc9009b649fae19f920b604ea delete mode 100644 test/integration/bisect/expected/.git_keep/refs/bisect/skip-1b06712fea4c03c8fce8e2b3862c059f8d7f8268 create mode 100644 test/integration/bisect/expected/.git_keep/refs/bisect/skip-bc21c8fabc28201fab6c60503168ecda25ad8626 create mode 100644 test/integration/bisect/expected/.git_keep/refs/bisect/skip-d1f7a85555fe6f10dd44754d35459ae741cb107c delete mode 100644 test/integration/bisect/expected/.git_keep/refs/bisect/skip-ee930b55b61910c0830b0c6ea1cf9ada066d27fc delete mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/06/4b01d296b5d0a6d829b2c6da812000909144a3 delete mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/0b/148673b6c3595b97542fcd5b5e97a568ea26b0 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/0f/373801691c466240bd131d28b2168712b045ba create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/10/e171beacb963e4f8a4dc1d80fd291c135902bb create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/11/e4fd4011c9ed3800bb33b85580dd1d09f6aefd create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/15/d4c5b8608fe472fd224333e60d44ea826cc80e create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/1a/35564b85e24c96e647b477aaf8d35dcf0de84d create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/1a/b342c03b4226cca1c751dba71fa2df0e7d82ee delete mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/2d/0d5709569edc32bd9ee891dc0645e7b7bf2061 delete mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/30/4e25b1cbcd673476a98779d817b4d87feba619 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/30/68d0d730547aaa5b86dbfe638db83133ae1421 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/33/3ff293caf2d3216edf22e3f1df64d43a7e1311 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/36/903784186b1b8b4a150dc656eccd49f94e114e create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/38/242e5215bc35b3e418c1d6d63fd0291001e10b delete mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3d/f063bdb2fd238bdf7bda23290b7da497589258 delete mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3e/94c347542e28f329499237920a81240575a1f4 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3f/bb9e626d4b7d30e58346b3eefaa342b15ab776 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3f/d9ad29c185eac6106cfa005a3aa594e21b9e06 delete mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/41/f9560c3e0f5f8be63b4aef08706e8fbe54e1d3 delete mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/54/5ee64d47536092ef63907a18995827a74fa77d create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/54/93d27d38b9902cf28b1035c644bf470df76060 delete mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/68/1e7676f6bd15140ad8d51345914d0b7fa69489 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/6f/a769bf11bd9dc4ff4e85f4951950b0bc34326f delete mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/72/e695b433526c667e356788b961ebe192878531 delete mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/78/7e69fd95b7075de9290439e54677d023ea92c7 delete mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/84/7efa05018f2fbf9e8ad84c188829d9b7ebd4d5 delete mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/93/feecfa069adae620503f0ea027c4d7d368efcc delete mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/96/095b64429648b96e25b3a02a5ccd43c61cafef delete mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/96/f59302fbb47e8abb38d110328500055c2eae8f create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/9c/836a5c3f513818d300b410f8cb3a2e3bbd42a1 delete mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/9f/b4f649e21a553f671bbd33c2ab4c5958c4d1b5 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b2/970eba9fd8dba8655094dc38fb4ee50b9bf23e create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b6/14152a335aabd8b5daa2c6abccc9425eb14177 delete mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b9/c5ec23f6a30f26f7a742f01b8bbac17a5daf35 delete mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/be/3e8df868feac07f915a39aaceb886aeca56442 delete mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d2/022605750ce8c6d2fd703df624fc1e191b799a create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d2/7a997859219951ecc95c351174c70ea0cf9d37 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d8/4e0684b1038552d5c8d86e67398d634f77ad3b delete mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d9/89cb769db41caf40f46f40aaa421568ee0d6bc create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/e5/59f83c6e8dd11680de70b487725e37ff2e283f delete mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/f5/9b0d2e37845a8d46ee072354598e8246f98324 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/objects/ff/231021500c7beb87de0d6d5edc29b6f9c000b1 delete mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-064b01d296b5d0a6d829b2c6da812000909144a3 create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-38242e5215bc35b3e418c1d6d63fd0291001e10b create mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-3fbb9e626d4b7d30e58346b3eefaa342b15ab776 delete mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-545ee64d47536092ef63907a18995827a74fa77d delete mode 100644 test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-b9c5ec23f6a30f26f7a742f01b8bbac17a5daf35 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 61a57e2efe349b00f615cab8b47e2612f6bb4f9d..2ad3e517ba8dcf0981429c77789bbd541b438fcb 100644 GIT binary patch delta 65 zcmeBV>||7N@eFciU|?VZV#dUeEHk9Cm=A+!iT`Y885tN@nKWM5PgDsMvD`6XK^FTv S-WL<69sYmw*KE@Yb|U~=ffkVf delta 65 zcmeBV>||7N@eFciU|?VZV#dVR4vr#m&4)m=&=;>=j0_B{Owut06IB95wyw?66p-Ea Sc-PaP)_t$_e0L~5I0OJ##}>Z; 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 0000000000000000000000000000000000000000..a22627c8d8fb87e35cc74ee98e0a06e006ff545c GIT binary patch literal 118 zcmV-+0Ez#20gcT;3IZ_@~ literal 0 HcmV?d00001 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,hLNJ_l(PUxViJpr zVlqIlyXE4$-PhgEi@(gvO+T@2Pd(+eUOh7PtufHxkB9)Sr~OpZKk*;$5#1M>mOChX CTuH_N diff --git a/test/integration/bisect/expected/.git_keep/objects/1e/2780095cd8e95b93f89268f72cda21d528ab38 b/test/integration/bisect/expected/.git_keep/objects/1e/2780095cd8e95b93f89268f72cda21d528ab38 deleted file mode 100644 index 928bae75c..000000000 --- a/test/integration/bisect/expected/.git_keep/objects/1e/2780095cd8e95b93f89268f72cda21d528ab38 +++ /dev/null @@ -1,2 +0,0 @@ -x -1 D=+z$In "ž3j`e盃 sy3e1,pMBs‰ k(ZR,QNhKPKGrRBX[&}\SYbarx=a5b: \ No newline at end of file diff --git a/test/integration/bisect/expected/.git_keep/objects/1f/d41e04d86ee95083d607da4e22abef9a570abc b/test/integration/bisect/expected/.git_keep/objects/1f/d41e04d86ee95083d607da4e22abef9a570abc deleted file mode 100644 index c41fd12475e3a0f214d244538e57fd2676f30b47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gaA93c@fD06pgwxeJnPlFbH0gr0mxvb#aS+EOC;e0%T#UWXYNUgr5R ztS@*No2rcslOVFA!V){SUa?5;Ai34ZkVD8U5X@RPeeIz_Cg)0GAuXwu(5V1Y&%jc_ zO9HAbkg4x+Up714?0LFf^;75dsV83Mi}e_RTn-WJ(R=62PWP#yf9gNqf-_%?SUTXv CtVmV> diff --git a/test/integration/bisect/expected/.git_keep/objects/26/7465454f74736bbe5b493c7f69dd3d024e26e5 b/test/integration/bisect/expected/.git_keep/objects/26/7465454f74736bbe5b493c7f69dd3d024e26e5 new file mode 100644 index 0000000000000000000000000000000000000000..edae3689b69f1ae3ac24c4cc81ba12867e93f314 GIT binary patch literal 147 zcmV;E0Brww0gcX03c@fDKw;NCMfQSpev(N*MChu=NX7{Y#+DMn=DwNIYcr=99DUpx$q8iW}A5g-J&*L|wnpZw>2a$i?HIZ$X^ BN5}vG diff --git a/test/integration/bisect/expected/.git_keep/objects/2c/dabd5c24e74e22323744543a8ebcbfb33c7f6e b/test/integration/bisect/expected/.git_keep/objects/2c/dabd5c24e74e22323744543a8ebcbfb33c7f6e deleted file mode 100644 index a4d335e98db8743c8650562f54226ca74a7fa504..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gaA93c@fD06pgwdlw{|G|2{v2tD-~o6QylV@rwP^XgJx!5hzMD0NgP}hiYlQ-yZD5{QOw4>zB+{9t#_^{=3$Xsl`ZK)QL?wO z)PtpDSBv3yzppz?GmO)G(+{`psTWz>6)+BtZ1RJHGorQTu*X!_Kl5J?$$SChmpkfO C%}0Cy diff --git a/test/integration/bisect/expected/.git_keep/objects/2c/e3bf88f382c762d97ac069eea18bed43a1bab2 b/test/integration/bisect/expected/.git_keep/objects/2c/e3bf88f382c762d97ac069eea18bed43a1bab2 deleted file mode 100644 index 42700f4e7..000000000 --- a/test/integration/bisect/expected/.git_keep/objects/2c/e3bf88f382c762d97ac069eea18bed43a1bab2 +++ /dev/null @@ -1,3 +0,0 @@ -xK -1D] oO "¬t7 -,<*+=g8]FU$SBK%TF52[- kLx\Gd@I)~_w;/2/7=TvR@7{hǩ.?~/uo< \ No newline at end of file diff --git a/test/integration/bisect/expected/.git_keep/objects/30/5a009f27eb14858ea0a3a1a740a5346a543537 b/test/integration/bisect/expected/.git_keep/objects/30/5a009f27eb14858ea0a3a1a740a5346a543537 deleted file mode 100644 index 6f1e02c738e1f16dea97eb1cf0bb5719111efa09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmV;D0B!$x0gaA93c@fD06pgwdlzJrY|Iu!gr540-DZP=v86=t`S#!gybi-K^U~U* zgCEkNZ)Q*u1rer9v9gMfj4^Q`#DS12#-ddNWw**^uMU-cCZVE9H6RC5%TdE1dx2OY zVl~NPPTu{#Y%or68K;|lq^(ao%}cw2KT}}LkpdjOM|3;gr@H;A|9nX93(pfe9dc1b ARR910 diff --git a/test/integration/bisect/expected/.git_keep/objects/32/e7b0308424a817ed5aa5bba94b06b72a1b8ce5 b/test/integration/bisect/expected/.git_keep/objects/32/e7b0308424a817ed5aa5bba94b06b72a1b8ce5 new file mode 100644 index 0000000000000000000000000000000000000000..f220ca5b80a65ef08f08e1ee8ad2fbf09af71d3c GIT binary patch literal 148 zcmV;F0Biqv0gcW<3c@fDKvCB@#q0&iB$H_aB0^U^#!Q@`U~DN7Jic9c0JopF_+@GB z(E)Qh^vw)3MdZvrM`0R+70GfVEutLB4>*JnlIG}E+3eN9QdX5(Et7hdB61U@K&eJw zYc#~dY)PHG`+eD9n&CXnSNlj?pLQxsy8tpp98(xZI3jxQ_PS4X`;-4Xkoy8q{5u)~ C^+TWl literal 0 HcmV?d00001 diff --git a/test/integration/bisect/expected/.git_keep/objects/39/983ea412adebe6c5a3d4451a7673cf0962c472 b/test/integration/bisect/expected/.git_keep/objects/39/983ea412adebe6c5a3d4451a7673cf0962c472 new file mode 100644 index 000000000..63c4d53b2 --- /dev/null +++ b/test/integration/bisect/expected/.git_keep/objects/39/983ea412adebe6c5a3d4451a7673cf0962c472 @@ -0,0 +1,2 @@ +xM +1 a=E4$ "j Co[Pպb}=OXsvB.b'fF6[AFI* ¾SU &}a^C9olXNMY1t6i#KDfb0)1xhY+(*EVbk`63gh_CcC{FpjIheAQ_V(MvP39DE6PC zWiBx)&x1L6xBI%obc6GByV^&V?P(`nmkWe}Fnf-Ka16nF*Vi7^>`(slklh!7**hv0 CK|>h; diff --git a/test/integration/bisect/expected/.git_keep/objects/47/8a007451b33c7a234c60f0d13b164561b29094 b/test/integration/bisect/expected/.git_keep/objects/47/8a007451b33c7a234c60f0d13b164561b29094 new file mode 100644 index 0000000000000000000000000000000000000000..1e2ee9643cb6426e8129e7660e2d941f5f41bb19 GIT binary patch literal 148 zcmV;F0Biqv0gcW*3IZ_@Kw;~gVtPT6%w%Q*BEnW4BR>-qjJqrmJic3a0Nck`yt4HE z7~mow#-<9BRn_K_6p9&z8={~l&xLa$svK*yH5Rj`OL>N}si(5^3pgfpQ}8mu(K&0)UiYb?fAXIPhvo}aLOPY5 C@kJ{D literal 0 HcmV?d00001 diff --git a/test/integration/bisect/expected/.git_keep/objects/55/30322be194fc9dea08ef86c9306bddeacb92db b/test/integration/bisect/expected/.git_keep/objects/55/30322be194fc9dea08ef86c9306bddeacb92db deleted file mode 100644 index 6be35c648fdef49a139d7a3bd0ae84743f620194..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmV;D0B!$x0gcW<3c@fDg<;n@#q0%{X(p2fM1-z-jA@*rU`#0yJib|Y0Jo3t!Jlg> zj|P;&q3vcMLMfw?dRv4!*+LeBmT z0Htskn+SNv6-7g6$wu^~6f~C9rpDYtb&^S)I5lhD=6;bjCDkH`BVS-kLB$kMArzfZNYo{Ic}^ z7=Sq*#-<7?k*WH|k&6#Z)=~`3X~8IwZ1I?PBHpaB>1#l(xn`@?RcsQ(F-g6NWyG8t zG6l{l1xiNV׬!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 0000000000000000000000000000000000000000..85c68ea1fe28feab9be24b6ca55e96c932f9d50e GIT binary patch literal 146 zcmV;D0B!$x0gaA93c@fD06pgwdlzJPlWrR*BJ|W}B%3V?#+DMn=i7r1@H))E=vwQe z0mbgrb~6y6sF)~u%MwDgOr4r&!AP>0q6I=FbX(f()gTHZr^rgh=VFu@i!8pF4%P=g zvfgtJ#ie(6 BMezUt 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 ee72d6df2bc62dc5fd8d499e8634bb279d715b6e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaA93c@fD06pgwdlzIkiJJyQgr540&1QpwwWUPx`S#!gJkBtO(Pf?= z9VqjmZ)Px{nKhE6F_)0Ig^+@YXXPR>R?anJ&FWU!?A5_62Q24vVakMx!%nDdLfW!a zLFVdHQz!3!Up5#gxQx@yJ~FRQJLxiCfjIgBQ-~gpM2K#;`&73-^Is1X+!wUrJ53bb BMsxrG 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 0000000000000000000000000000000000000000..25e0f33f890cdf139eb5e5443880003e5926ac5f GIT binary patch literal 147 zcmV;E0Brww0gaA93c@fD06pgwdlzIkX|fv-5qk0&+hmJ^v86=t`S#!gybi-KWohlv zfpR?b%?#9Xw5%E?5h1lYu|}VYBrCBdoC8zQRNShYy*h}m?8zn!JTndvV?rM)W*o9) z7Ai*b9&q~Z_hp0e2Iuj1wU4&-X{WNZ3s4#YN%SmmBtmpM-KVjp5jK-w{kCi{PH-NltG@HRKJ+BZd;tvJArBN8j^Do7=|0umrPnO>A z!$P9N*iO1%Kp(k1T#R3In7kxl`{QjGr?omVk)PKH(Xg;SAJ7bc} BL}vg1 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 0000000000000000000000000000000000000000..017c9bf7eaaad332c8c08b5633943ace4900dce8 GIT binary patch literal 149 zcmV;G0BZku0gcW<3c@fDg<;n@#q0&iWRh_LB0^U^#x$9tU~MT8Jib|Y0C$g{Z}G~y zERP15`OtPVFlC9AW??CmBzhk?&A|$?a`c5TccSDr-R;%Dat*VDWams%$y&l>oQ0y) zJ~&TWDHg3x-|fEcFpO{+#+!X~*`9VP>v9F;NGK_s1&)Z`yI%XLW`FXZ2Tbk@ab7zc D5c)=r literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a2c2b4a5cc1143cf6be0f6542f6ab8939602b55f GIT binary patch literal 148 zcmV;F0Biqv0gaA93c@fDMP26<*$Xl==}aPs2wn9UlVpm5wWUPx_-5e&+sR@AMs*{egWwM3JIK_+XKl_X9n5ejFH zdh<00O&pxO`+eD97~wpOSNq7kKJBE-d;!cUVxhnVj)>m7z3x-p{^UOo=-n6NgE|5W CKt+%M literal 0 HcmV?d00001 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 eb499d17ce0a0ce9e5a4dfe383d2577449060346..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmV;D0B!$x0gaA93c@fD06pgwdlw{|Y!d?_LQj3hcC$gj*b*Z6d~@&tUWZ{A*=l`s zz!VO>sRBBspk92;$mH3DHQB^|K*=tr7-Ez_Xm)P;>cHY1W#u)*f{~J{3Qiu^5hz>= zp-xj0HvI1Qt--v&WnOOj;krNdBwM`#26AT`JvlfcT5AR!Q(gbme?B0YFM&2YBT!jD AV*mgE 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 0000000000000000000000000000000000000000..e69a0bf1702455e2aeba72e46c91242c7636d862 GIT binary patch literal 148 zcmV;F0Biqv0gaAJ3c@fDKwak)vlk?jOg;l5LRURToJ>$Kwv-4S-!43W+sAwGWa<4e z0684SrV6FC=rJPYhQSf1#GHh3yh+pONZ2w7saeaWuK|_4%aw0VIQZCVvlt0$wZ2ht zfvS@nqeWBRBciotr~A~N! literal 0 HcmV?d00001 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^y@Wjdy)@TQX9Nl4C%QTv8VD3509S zSOmtz-~$xH?|xr*J1_P;FIW9=+n#!owOy=F!w^hJ_UOHHX4G-2>!1AREtxMi-#V85 Cn@7C> literal 0 HcmV?d00001 diff --git a/test/integration/bisect/expected/.git_keep/objects/ee/930b55b61910c0830b0c6ea1cf9ada066d27fc b/test/integration/bisect/expected/.git_keep/objects/ee/930b55b61910c0830b0c6ea1cf9ada066d27fc deleted file mode 100644 index 54ba68c9ad086bffca7a5f940ce081d3d4ad1cbf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaAL3c@fDMqT$5*$Xm1X)*;7p{pJv87C+hTS^3vZx$ZF?Z z&EXUdZ8vk60VA_g=13azIC`(K5KXL{BYPC`h%{_zw^tW4gosouc?DJ}YGPfMKnmkj zecj!>xbwVR?UU;Ew3Dv&;xKp;=-=dyhyX)hdsMSO@gMJc)fb6oIcCT` BK==Rv diff --git a/test/integration/bisect/expected/.git_keep/objects/f8/174a4db5bb2082ebe73b29a47448a300fea7ae b/test/integration/bisect/expected/.git_keep/objects/f8/174a4db5bb2082ebe73b29a47448a300fea7ae deleted file mode 100644 index 470a7c545dabc7af350ea70905c2aa149d5a0046..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 145 zcmV;C0B-+y0gaAH3IZ_@06pgweHSFXWN8o)<}}af#DIcvh9QE_cMd+lIu>=Py7c}S zfEo^CYYj?Zj2gYNMak5vsokVhE0M(~OhgolvRiFyuK}7XdsShyoOT48Aqpi@)LV=a z1hePl>^<(w2Gb1ZX}-3P_4V0Kb?FztD3pC-Avhv>?{>RSjrM2$>p|QX(|tGlq6tH0 diff --git a/test/integration/bisect/expected/.git_keep/objects/fb/bb6006074afe8cc9009b649fae19f920b604ea b/test/integration/bisect/expected/.git_keep/objects/fb/bb6006074afe8cc9009b649fae19f920b604ea deleted file mode 100644 index 0c80c5a33ba8005a4bf4588a2108eb20927a88ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gcW<3IZ_39#%=~EF*0K$3SM%NN?MxK;&YT(i>OCsOVw?<+j9U*OaWPnOi8hMUo^9}Bq>zP zG392SW64fm||7N@eFciU|?VZV#dS|&sRu?^#y@w$zLDD85tN@nKWwePE-jLS+jiCgk39l SZ1nPHY||7N@eFciU|?VZV#dS|_rELkrOyG;ipl(Wj0_B{Od2VdCaMIADEcU|GoLmH Se!EfM?%;IIeeH{k{{jGuDi&%0 diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/HEAD b/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/HEAD index a47298e4b..31a81bf7a 100644 --- a/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/HEAD +++ b/test/integration/bisectFromOtherBranch/expected/.git_keep/logs/HEAD @@ -1,26 +1,28 @@ -0000000000000000000000000000000000000000 3e94c347542e28f329499237920a81240575a1f4 CI 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 41b1acb1795663b815b66856103390ccf03eb383..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaA93c@fD06pgwdlw|zq`O%V5qjz~vdM~qv86=t`S#!gWNyP8rYx;J zI-t;@Z)OnGBvw+~2}+@=Sj0gG1%+ym6DY$H(z3Ns3AGe#i`yz zoVSI7lo;8_d)$`|rWwxDeASQi^{J=2^a~JsM=_>Ea3n%Bd)=po{>gtH2+bE94LWXo Ctwpl{ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..76c433f1ee70ab6fa6f7fbb7461c21b127efd642 GIT binary patch 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1bbb2bb68baeea545c2b6438086218dcf99532dc GIT binary patch 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..90434de85801ddcbcc680506cea4f2893956265a GIT binary patch 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* literal 0 HcmV?d00001 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+T}H%am>0Ju|5!|P|1mCKQVC( z5)8Q(gEgemd)(I@mK&Ux+f_cPZ%;XuwO;_|CVGy@a75Hv&32v|@+bd!K%>4m(K;dG CPeAVg diff --git a/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/30/68d0d730547aaa5b86dbfe638db83133ae1421 b/test/integration/bisectFromOtherBranch/expected/.git_keep/objects/30/68d0d730547aaa5b86dbfe638db83133ae1421 new file mode 100644 index 0000000000000000000000000000000000000000..8d4ae099919d55c7fb868c061a6fe1aca300889b GIT binary patch literal 146 zcmV;D0B!$x0gaAJ3c@fH0A1%4*$eVs)1)sTB6Q_3-mfTFTS^3vZxD zD(sU5ez*Iw#qk!;""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 baf2c12314324c0bbc8d6d2bf35792026b0ea01b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaAJ3c@fDKwak)vlnEh%}f#~B6QVbLT^ocxBGU$yudUsH~qxAKlPHgdIb_YlIsD(nF!Hz+NYZSssDUn^97TTIeLL_ BM|}VQ 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 e7ecc0e452dc4dd0be782d3ee7aab40dd4c90946..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 121 zcmV-<0EYi~0ga783c@fD06pgwdlzK4%_b>`2tD-~?PiMwLrPr1=UeatUWXY*YAKrm zF`cZbLiCbR6NfzXNtdvMz+LjfKCvLKDQbsV*v)Ty)CS`O*KxY*XD<6wFH*}5DEOWt b55#aLLUac`CZ>PtZr$3;;8(dX)_^W!O>8#x 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 0000000000000000000000000000000000000000..34440506906eb68ddfc6af9deaafda1444db49e7 GIT binary patch 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 literal 0 HcmV?d00001 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 9cfa98a7215ba945716d5693bcb1445522015af7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gcW<3c^4PKvCCoitGhRCT7|J5uvLdBh6$`u(p&DJic9c0JopF__oaR zqXA_(w9Or?nDmATXprWi9F{q99jv#n{=o zbcIvz)hy_{-Ioo95iY}c^N-H!(@(a{SDLioEkq9yDb)RbfC;xfK;S0LWJFR?< BONsyh 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 2567c1e4f562db5dd5b87c0bd9ef3e684985d736..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaA93c@fD06pgwdlw{|xSK492tD-~*>sD7v86=t`S#!gybd!kb!qL< z0fi5JGXwF{Y&wZoU$P|T8bv~$LlBRes}D*zPsOcevsZ@{jD_?ZBL%L^$s%#eS%uNm zaBowlh_1Z*ec50b;WCUj`;@jm?Npa`1>|$YM1llIMDN{B_o;4w>OUWl+!w+BId%LC BMXvw= 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 0000000000000000000000000000000000000000..166e5ee14d061e7625ac31a9e77ebedace8e8755 GIT binary patch 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-KVU$}`P9))wvZGAZN5xtRlV``-*UHs};$lr^)4jYpVBmz5t%T$=YRJ(_vP;Ms z$s(el5VJa??|xr*m}VHK`BpyKwr9C4Yr6skb~Jb)4`(7obJSz1mp}Q>1F`u60^&LJ DvQkJG 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 e8c75bad7ec55a33ed6beec366d6fba7c0159241..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gcW*3IZ_@Kw;~gBE2A)$xM;~5n(Hjk)H_)uDdJ|Jic3a0Nck`yt>Tu zV^|PAj7`-xAJj>cSUOfdi$c5B}3)j`f;N$09@5|mg?y&?y-$VsH4 z50=#zarxcv%Lc;;mtnlwC%5%!r?RvwP~t!m_a+>P5ZzAqscwJjKOemN0t$;bsoq#b AqyPW_ 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 c90ce22da828363198a85036c68a8f785587a8d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gcX03c@fDKw;N8#q0&iOlFz{M1-z-jQmVcu(p&49^VQc!0qE(yt2&m zy#q!$^i35iYYZgb1{)HwCmJ|v5K579O;Vb0iM5(FZTjpGTjus9gh|A;!DG(Vxk4#( zktm^X#VjVh`fb@@oZvi8SAC~>edwty^968Vhh8EI91*QGd)=qH{>gtHg82aF**a0J C>P52v 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 2a325619633b40fd9a3e09b91c27f0d8f228937d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmV;H0BQet0gaDK3IZ_@L|x|;*$dM7bUJ}Sgjvlo(wPnl#ueBmT 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 literal 0 HcmV?d00001 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 53eba54d8d322577f68d1582f54867550711c29e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gcW<3c@fDKvCB@#q0%{Nisw`I3$(oY>}ioB$A53 zv&It3Vlj}(?|xr*m}VHK`KF)Twx?d|+O9ysJBpl$;Y@^Rj(SXW{geMZMDqnuEIP|3 C0!YUI 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 0000000000000000000000000000000000000000..e9a1d720b63f4d4f80a9c6f29728ec2e6cd380f5 GIT binary patch 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$ literal 0 HcmV?d00001 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 75e56067d9ab638ecc3ef3caeb22e401b757437a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaA93c@fD06pgwdlw|zB%2M02tE0XO|n73*is_+e0%T#UWXZ&vh@BK zfQb%cQw4{$QAq)7;VH+E5p(g(jx@4G=LJbgs##^z*MO`}xi%(lD#gZ@Fo;VcMKd#r z77672WaK^W%Lele&hzc6AL;8;Pi5&BK=KY_*h@GfT5EQ?PYwN3|M`H?d;zYzJ8P!r BL=^x4 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 6cbaf038ee0c933fb9014149c51264091cc402bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaA93c@fD06pgwxeJo*Cc9Y>5qjz~)@Fl(v86=t`S#!gybi-K^U~U* zdk{MG&CKVV2~hz-qg1$M$xt}VfQ5*PRV#E;NN&~5Ufrjd%qW(~2`R{6l~4jJWRa8y zR*qGfi_>?%FPk4He;%i+eYCAlJIzbGc%X>DNg(+nKnQN9`&73-^`F0Y+!wzjIjSXR BMz#O| 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 e019fa50f8988d9bd8ff21445e6eb088e2c26afd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmV;F0Biqv0gaA93IZ_#IX_LF;gkVx4NPtTC17gkp>n z7tTX1u6UE){l4z7+~B<2uKG!Bd+JHnb^)55rQn%797h_>SjVZZf8swLtoZ_AyE_Ji Ca!0!W 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 0000000000000000000000000000000000000000..4a21451f34ebb4cd371b9e8a936be078ae3c7dee GIT binary patch literal 148 zcmV;F0Biqv0gaA93c@fDMP26<*$a|MlbHz=5xVLzCg~IfV@rwP@y)^mxPAY9cx9{g z(JUl9wL{gqAdx7m=g66z4+O}BqN`#?jFMPE!)kUp^wp0}fgr1toN(v^OIQjl?AFC6 zC@{q2e9lJR?YmdX8`9+r#-6apZd?Y0OkumbULXp CtVjC* literal 0 HcmV?d00001 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 b8fafea4fe5bd4fac4009f124d18e3ed654c2dae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmV;E0Brww0gaA93c@fD06pgwdlw{IH=7NJ2tD-~n{G)M%Asl*{j2xB$XUF&6%)hC0~hmswxc_ zSj_y)xj23I`?A3}!DXCo_R+RJ?NpX_1!Ov73<(1q5xsZ2-KVY$s`jH5xVLz@)=Puwv-4S-!43W+sAwG>eBmT z046?+O%2j8O#Ph