summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2022-01-26 19:12:44 +1100
committerJesse Duffield <jessedduffield@gmail.com>2022-01-26 19:29:17 +1100
commit5a3f81d1f7a0c66572ea4044a5910cdf1954fefb (patch)
treec273015c8d392dad26601282fa8634efe27e93b8
parentebbdf829e793eb0bbac819eef4bffacf0bce48fb (diff)
select current bisect commit even if bisect was started on another branch
-rw-r--r--pkg/commands/git_commands/bisect.go7
-rw-r--r--pkg/commands/git_commands/bisect_info.go2
-rw-r--r--pkg/gui/bisect.go39
-rw-r--r--pkg/gui/commits_panel.go6
-rw-r--r--test/integration/bisect/expected/.git_keep/BISECT_EXPECTED_REV2
-rw-r--r--test/integration/bisect/expected/.git_keep/BISECT_LOG30
-rw-r--r--test/integration/bisect/expected/.git_keep/indexbin137 -> 137 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/logs/HEAD49
-rw-r--r--test/integration/bisect/expected/.git_keep/logs/refs/heads/master40
-rw-r--r--test/integration/bisect/expected/.git_keep/logs/refs/heads/test2
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/00/5ca78c7fb8157683fa61158235b250d2316004bin0 -> 118 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/05/4bdf969fdcf1f90f1998666f628d40f72fde4f2
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/12/a951328c3156482355edebf6c81ded5480aff43
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/1b/06712fea4c03c8fce8e2b3862c059f8d7f8268bin148 -> 0 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/1e/2780095cd8e95b93f89268f72cda21d528ab382
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/1f/d41e04d86ee95083d607da4e22abef9a570abcbin148 -> 0 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/26/7465454f74736bbe5b493c7f69dd3d024e26e5bin0 -> 147 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/27/584027b768a0d33ba92ad8784c09589de325b9bin147 -> 0 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/2c/dabd5c24e74e22323744543a8ebcbfb33c7f6ebin148 -> 0 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/2c/e3bf88f382c762d97ac069eea18bed43a1bab23
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/30/5a009f27eb14858ea0a3a1a740a5346a543537bin146 -> 0 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/32/e7b0308424a817ed5aa5bba94b06b72a1b8ce5bin0 -> 148 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/39/983ea412adebe6c5a3d4451a7673cf0962c4722
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/42/fb40334713a02429d4f8d72f7fe7376caef15bbin148 -> 0 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/47/8a007451b33c7a234c60f0d13b164561b29094bin0 -> 148 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/55/30322be194fc9dea08ef86c9306bddeacb92dbbin146 -> 0 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/5f/9397e5bcee1ac2a3fe6d834d42e36b74ef4ca8bin0 -> 148 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/67/fbfb3b74c2381ad1e058949231f2b4f0c8921fbin0 -> 149 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/68/8bdfce6d5b16ebd7f5c6d6d5d68de7ea5344edbin148 -> 0 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/78/d41b2abbd2f52c1ebf2f496268a915d59eb27b2
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/81/0c10a66b1dabfe117eecdfb0f638bb1cd0ede53
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/82/d721eb037f7045056023d0904989781ce1f526bin0 -> 146 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/96/202a92c1d3bde1b20d6f3dec8e742d09732b4dbin0 -> 147 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/98/c3099431a8777741ea114272919d6645418037bin147 -> 0 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/ac/324deab67f1749eeec1531b37dfaff41e559cabin147 -> 0 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/b7/cd988a171f7f99b7e190ca2b46060074cb379a2
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/b9/7844c9437a4ab69c8165cadd97bc597b43135bbin0 -> 147 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/bc/21c8fabc28201fab6c60503168ecda25ad8626bin0 -> 148 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/c0/9b924073b6a6cc1b2208f9a00f7b73bec2add2bin147 -> 0 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/d1/f7a85555fe6f10dd44754d35459ae741cb107cbin0 -> 149 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/d9/328d9b2c9536fdf01641dd03f4a254d2c86601bin0 -> 148 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/db/b21289ee21b2ff0f3de2bc7d00038b30c4e353bin0 -> 148 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/dd/9d90ed2d1fa5a284adba081199f18458977547bin146 -> 0 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/e5/9bbaffe94b06acaadab4245f30ff3e11c66e5bbin0 -> 148 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/e9/27f0f9467e772eea36f24053c9b534303b106abin0 -> 148 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/e9/d2f825e793bc9ac2be698348dbe669bad34cad4
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/eb/e59a71e9750e75fb983f241687cdf7f0c8ce94bin0 -> 148 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/ee/930b55b61910c0830b0c6ea1cf9ada066d27fcbin147 -> 0 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/f8/174a4db5bb2082ebe73b29a47448a300fea7aebin145 -> 0 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/objects/fb/bb6006074afe8cc9009b649fae19f920b604eabin148 -> 0 bytes
-rw-r--r--test/integration/bisect/expected/.git_keep/refs/bisect/bad2
-rw-r--r--test/integration/bisect/expected/.git_keep/refs/bisect/good-39983ea412adebe6c5a3d4451a7673cf0962c4721
-rw-r--r--test/integration/bisect/expected/.git_keep/refs/bisect/good-67fbfb3b74c2381ad1e058949231f2b4f0c8921f1
-rw-r--r--test/integration/bisect/expected/.git_keep/refs/bisect/good-ac324deab67f1749eeec1531b37dfaff41e559ca1
-rw-r--r--test/integration/bisect/expected/.git_keep/refs/bisect/good-e927f0f9467e772eea36f24053c9b534303b106a1
-rw-r--r--test/integration/bisect/expected/.git_keep/refs/bisect/good-e9d2f825e793bc9ac2be698348dbe669bad34cad1
-rw-r--r--test/integration/bisect/expected/.git_keep/refs/bisect/good-fbbb6006074afe8cc9009b649fae19f920b604ea1
-rw-r--r--test/integration/bisect/expected/.git_keep/refs/bisect/skip-1b06712fea4c03c8fce8e2b3862c059f8d7f82681
-rw-r--r--test/integration/bisect/expected/.git_keep/refs/bisect/skip-bc21c8fabc28201fab6c60503168ecda25ad86261
-rw-r--r--test/integration/bisect/expected/.git_keep/refs/bisect/skip-d1f7a85555fe6f10dd44754d35459ae741cb107c1
-rw-r--r--test/integration/bisect/expected/.git_keep/refs/bisect/skip-ee930b55b61910c0830b0c6ea1cf9ada066d27fc1
-rw-r--r--test/integration/bisect/expected/.git_keep/refs/heads/master2
-rw-r--r--test/integration/bisect/expected/.git_keep/refs/heads/test2
-rw-r--r--test/integration/bisect/recording.json2
-rw-r--r--test/integration/bisect/test.json2
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_EXPECTED_REV2
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/BISECT_LOG20
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/indexbin137 -> 137 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/logs/HEAD54
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/master2
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/other42
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/logs/refs/heads/test2
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/06/4b01d296b5d0a6d829b2c6da812000909144a3bin147 -> 0 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/0b/148673b6c3595b97542fcd5b5e97a568ea26b02
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/0f/373801691c466240bd131d28b2168712b045ba3
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/10/e171beacb963e4f8a4dc1d80fd291c135902bbbin0 -> 148 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/11/e4fd4011c9ed3800bb33b85580dd1d09f6aefdbin0 -> 147 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/15/d4c5b8608fe472fd224333e60d44ea826cc80ebin0 -> 147 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/1a/35564b85e24c96e647b477aaf8d35dcf0de84dbin0 -> 147 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/1a/b342c03b4226cca1c751dba71fa2df0e7d82eebin0 -> 148 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/2d/0d5709569edc32bd9ee891dc0645e7b7bf20612
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/30/4e25b1cbcd673476a98779d817b4d87feba619bin148 -> 0 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/30/68d0d730547aaa5b86dbfe638db83133ae1421bin0 -> 146 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/33/3ff293caf2d3216edf22e3f1df64d43a7e1311bin0 -> 149 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/36/903784186b1b8b4a150dc656eccd49f94e114ebin0 -> 121 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/38/242e5215bc35b3e418c1d6d63fd0291001e10b2
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3d/f063bdb2fd238bdf7bda23290b7da497589258bin147 -> 0 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3e/94c347542e28f329499237920a81240575a1f4bin121 -> 0 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3f/bb9e626d4b7d30e58346b3eefaa342b15ab776bin0 -> 147 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/3f/d9ad29c185eac6106cfa005a3aa594e21b9e06bin0 -> 147 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/41/f9560c3e0f5f8be63b4aef08706e8fbe54e1d3bin147 -> 0 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/54/5ee64d47536092ef63907a18995827a74fa77dbin147 -> 0 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/54/93d27d38b9902cf28b1035c644bf470df76060bin0 -> 147 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/68/1e7676f6bd15140ad8d51345914d0b7fa694893
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/6f/a769bf11bd9dc4ff4e85f4951950b0bc34326f3
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/72/e695b433526c667e356788b961ebe192878531bin149 -> 0 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/78/7e69fd95b7075de9290439e54677d023ea92c7bin148 -> 0 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/84/7efa05018f2fbf9e8ad84c188829d9b7ebd4d5bin146 -> 0 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/93/feecfa069adae620503f0ea027c4d7d368efccbin148 -> 0 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/96/095b64429648b96e25b3a02a5ccd43c61cafefbin150 -> 0 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/96/f59302fbb47e8abb38d110328500055c2eae8f2
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/9c/836a5c3f513818d300b410f8cb3a2e3bbd42a1bin0 -> 148 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/9f/b4f649e21a553f671bbd33c2ab4c5958c4d1b5bin148 -> 0 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b2/970eba9fd8dba8655094dc38fb4ee50b9bf23ebin0 -> 148 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b6/14152a335aabd8b5daa2c6abccc9425eb141772
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/b9/c5ec23f6a30f26f7a742f01b8bbac17a5daf35bin147 -> 0 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/be/3e8df868feac07f915a39aaceb886aeca56442bin147 -> 0 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d2/022605750ce8c6d2fd703df624fc1e191b799abin148 -> 0 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d2/7a997859219951ecc95c351174c70ea0cf9d373
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d8/4e0684b1038552d5c8d86e67398d634f77ad3bbin0 -> 148 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/d9/89cb769db41caf40f46f40aaa421568ee0d6bc3
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/e5/59f83c6e8dd11680de70b487725e37ff2e283f3
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/f5/9b0d2e37845a8d46ee072354598e8246f98324bin147 -> 0 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/objects/ff/231021500c7beb87de0d6d5edc29b6f9c000b1bin0 -> 147 bytes
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/bad2
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-064b01d296b5d0a6d829b2c6da812000909144a31
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-38242e5215bc35b3e418c1d6d63fd0291001e10b1
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-3fbb9e626d4b7d30e58346b3eefaa342b15ab7761
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-545ee64d47536092ef63907a18995827a74fa77d1
-rw-r--r--test/integration/bisectFromOtherBranch/expected/.git_keep/refs/bisect/good-b9c5ec23f6a30f26f7a742f01b8bbac17a5daf351