add another bisect integration test

pkg/integration/components/shell.go

@@ -44,6 +44,10 @@ func (s *Shell) NewBranch(name string) *Shell {
 	return s.RunCommand("git checkout -b " + name)
 }
 
+func (s *Shell) Checkout(name string) *Shell {
+	return s.RunCommand("git checkout " + name)
+}
+
 func (s *Shell) GitAdd(path string) *Shell {
 	return s.RunCommand(fmt.Sprintf("git add \"%s\"", path))
 }

pkg/integration/tests/bisect/from_other_branch.go

@@ -0,0 +1,69 @@
+package bisect
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var FromOtherBranch = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Opening lazygit when bisect has been started from another branch. There's an issue where we don't reselect the current branch if we mark the current branch as bad so this test side-steps that problem",
+	ExtraCmdArgs: "",
+	Skip:         false,
+	SetupRepo: func(shell *Shell) {
+		shell.
+			EmptyCommit("only commit on master"). // this'll ensure we have a master branch
+			NewBranch("other").
+			CreateNCommits(10).
+			Checkout("master").
+			RunCommand("git bisect start other~2 other~5")
+	},
+	SetupConfig: func(cfg *config.AppConfig) {},
+	Run: func(
+		shell *Shell,
+		input *Input,
+		assert *Assert,
+		keys config.KeybindingConfig,
+	) {
+		viewBisectOptions := func() {
+			input.PressKeys(keys.Commits.ViewBisectOptions)
+			assert.InMenu()
+		}
+
+		markCommitAsGood := func() {
+			viewBisectOptions()
+			assert.MatchSelectedLine(Contains("bad"))
+			input.NextItem()
+			assert.MatchSelectedLine(Contains("good"))
+
+			input.Confirm()
+		}
+
+		assert.MatchViewContent("information", Contains("bisecting"))
+
+		assert.AtLeastOneCommit()
+
+		input.SwitchToCommitsWindow()
+
+		assert.MatchSelectedLine(Contains("<-- bad"))
+		assert.MatchSelectedLine(Contains("commit 08"))
+
+		input.NextItem()
+		assert.MatchSelectedLine(Contains("<-- current"))
+		assert.MatchSelectedLine(Contains("commit 07"))
+
+		markCommitAsGood()
+
+		assert.InAlert()
+		assert.MatchCurrentViewContent(Contains("Bisect complete!"))
+		assert.MatchCurrentViewContent(Contains("commit 08"))
+		assert.MatchCurrentViewContent(Contains("Do you want to reset"))
+		input.Confirm()
+
+		assert.MatchViewContent("information", NotContains("bisecting"))
+
+		// back in master branch which just had the one commit
+		assert.CurrentViewName("commits")
+		assert.CommitCount(1)
+		assert.MatchSelectedLine(Contains("only commit on master"))
+	},
+})

pkg/integration/tests/tests.go

@@ -29,6 +29,7 @@ var tests = []*components.IntegrationTest{
 	custom_commands.MultiplePrompts,
 	custom_commands.MenuFromCommand,
 	bisect.Basic,
+	bisect.FromOtherBranch,
 }
 
 func GetTests() []*components.IntegrationTest {

test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_EXPECTED_REV

@@ -1 +0,0 @@
-10e171beacb963e4f8a4dc1d80fd291c135902bb

test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_LOG

@@ -1,12 +0,0 @@
-# bad: [0f373801691c466240bd131d28b2168712b045ba] commit 18
-# good: [38242e5215bc35b3e418c1d6d63fd0291001e10b] commit 7
-git bisect start 'other~2' 'other~13'
-# bad: [d27a997859219951ecc95c351174c70ea0cf9d37] commit 12
-git bisect bad d27a997859219951ecc95c351174c70ea0cf9d37
-# good: [3fbb9e626d4b7d30e58346b3eefaa342b15ab776] commit 9
-git bisect good 3fbb9e626d4b7d30e58346b3eefaa342b15ab776
-# bad: [d84e0684b1038552d5c8d86e67398d634f77ad3b] commit 11
-git bisect bad d84e0684b1038552d5c8d86e67398d634f77ad3b
-# bad: [10e171beacb963e4f8a4dc1d80fd291c135902bb] commit 10
-git bisect bad 10e171beacb963e4f8a4dc1d80fd291c135902bb
-# first bad commit: [10e171beacb963e4f8a4dc1d80fd291c135902bb] commit 10

test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_NAMES

@@ -1 +0,0 @@
-

test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_START

@@ -1 +0,0 @@
-master

test/integration/bisectFromOtherBranch/expected/repo/.git_keep/BISECT_TERMS

@@ -1,2 +0,0 @@
-bad
-good

test/integration/bisectFromOtherBranch/expected/repo/.git_keep/COMMIT_EDITMSG

@@ -1 +0,0 @@
-commit 20

test/integration/bisectFromOtherBranch/expected/repo/.git_keep/HEAD

@@ -1 +0,0 @@
-ref: refs/heads/test

test/integration/bisectFromOtherBranch/expected/repo/.git_keep/logs/HEAD

@@ -1,28 +0,0 @@
-0000000000000000000000000000000000000000 36903784186b1b8b4a150dc656eccd49f94e114e CI <CI@example.com> 1643177881 +1100	commit (initial): first commit
-36903784186b1b8b4a150dc656eccd49f94e114e 36903784186b1b8b4a150dc656eccd49f94e114e CI <CI@example.com> 1643177881 +1100	checkout: moving from master to other
-36903784186b1b8b4a150dc656eccd49f94e114e 1ab342c03b4226cca1c751dba71fa2df0e7d82ee CI <CI@example.com> 1643177881 +1100	commit: commit 1
-1ab342c03b4226cca1c751dba71fa2df0e7d82ee 15d4c5b8608fe472fd224333e60d44ea826cc80e CI <CI@example.com> 1643177881 +1100	commit: commit 2
-15d4c5b8608fe472fd224333e60d44ea826cc80e b614152a335aabd8b5daa2c6abccc9425eb14177 CI <CI@example.com> 1643177881 +1100	commit: commit 3
-b614152a335aabd8b5daa2c6abccc9425eb14177 1a35564b85e24c96e647b477aaf8d35dcf0de84d CI <CI@example.com> 1643177881 +1100	commit: commit 4
-1a35564b85e24c96e647b477aaf8d35dcf0de84d 11e4fd4011c9ed3800bb33b85580dd1d09f6aefd CI <CI@example.com> 1643177881 +1100	commit: commit 5
-11e4fd4011c9ed3800bb33b85580dd1d09f6aefd 3068d0d730547aaa5b86dbfe638db83133ae1421 CI <CI@example.com> 1643177881 +1100	commit: commit 6
-3068d0d730547aaa5b86dbfe638db83133ae1421 38242e5215bc35b3e418c1d6d63fd0291001e10b CI <CI@example.com> 1643177881 +1100	commit: commit 7
-38242e5215bc35b3e418c1d6d63fd0291001e10b ff231021500c7beb87de0d6d5edc29b6f9c000b1 CI <CI@example.com> 1643177881 +1100	commit: commit 8
-ff231021500c7beb87de0d6d5edc29b6f9c000b1 3fbb9e626d4b7d30e58346b3eefaa342b15ab776 CI <CI@example.com> 1643177881 +1100	commit: commit 9
-3fbb9e626d4b7d30e58346b3eefaa342b15ab776 10e171beacb963e4f8a4dc1d80fd291c135902bb CI <CI@example.com> 1643177881 +1100	commit: commit 10
-10e171beacb963e4f8a4dc1d80fd291c135902bb d84e0684b1038552d5c8d86e67398d634f77ad3b CI <CI@example.com> 1643177882 +1100	commit: commit 11
-d84e0684b1038552d5c8d86e67398d634f77ad3b d27a997859219951ecc95c351174c70ea0cf9d37 CI <CI@example.com> 1643177882 +1100	commit: commit 12
-d27a997859219951ecc95c351174c70ea0cf9d37 3fd9ad29c185eac6106cfa005a3aa594e21b9e06 CI <CI@example.com> 1643177882 +1100	commit: commit 13
-3fd9ad29c185eac6106cfa005a3aa594e21b9e06 b2970eba9fd8dba8655094dc38fb4ee50b9bf23e CI <CI@example.com> 1643177882 +1100	commit: commit 14
-b2970eba9fd8dba8655094dc38fb4ee50b9bf23e 6fa769bf11bd9dc4ff4e85f4951950b0bc34326f CI <CI@example.com> 1643177882 +1100	commit: commit 15
-6fa769bf11bd9dc4ff4e85f4951950b0bc34326f 9c836a5c3f513818d300b410f8cb3a2e3bbd42a1 CI <CI@example.com> 1643177882 +1100	commit: commit 16
-9c836a5c3f513818d300b410f8cb3a2e3bbd42a1 5493d27d38b9902cf28b1035c644bf470df76060 CI <CI@example.com> 1643177882 +1100	commit: commit 17
-5493d27d38b9902cf28b1035c644bf470df76060 0f373801691c466240bd131d28b2168712b045ba CI <CI@example.com> 1643177882 +1100	commit: commit 18
-0f373801691c466240bd131d28b2168712b045ba 333ff293caf2d3216edf22e3f1df64d43a7e1311 CI <CI@example.com> 1643177882 +1100	commit: commit 19
-333ff293caf2d3216edf22e3f1df64d43a7e1311 e559f83c6e8dd11680de70b487725e37ff2e283f CI <CI@example.com> 1643177882 +1100	commit: commit 20
-e559f83c6e8dd11680de70b487725e37ff2e283f 36903784186b1b8b4a150dc656eccd49f94e114e CI <CI@example.com> 1643177882 +1100	checkout: moving from other to master
-36903784186b1b8b4a150dc656eccd49f94e114e d27a997859219951ecc95c351174c70ea0cf9d37 CI <CI@example.com> 1643177882 +1100	checkout: moving from master to d27a997859219951ecc95c351174c70ea0cf9d37
-d27a997859219951ecc95c351174c70ea0cf9d37 3fbb9e626d4b7d30e58346b3eefaa342b15ab776 CI <CI@example.com> 1643177885 +1100	checkout: moving from d27a997859219951ecc95c351174c70ea0cf9d37 to 3fbb9e626d4b7d30e58346b3eefaa342b15ab776
-3fbb9e626d4b7d30e58346b3eefaa342b15ab776 d84e0684b1038552d5c8d86e67398d634f77ad3b CI <CI@example.com> 1643177886 +1100	checkout: moving from 3fbb9e626d4b7d30e58346b3eefaa342b15ab776 to d84e0684b1038552d5c8d86e67398d634f77ad3b
-d84e0684b1038552d5c8d86e67398d634f77ad3b 10e171beacb963e4f8a4dc1d80fd291c135902bb CI <CI@example.com> 1643177888 +1100	checkout: moving from d84e0684b1038552d5c8d86e67398d634f77ad3b to 10e171beacb963e4f8a4dc1d80fd291c135902bb
-10e171beacb963e4f8a4dc1d80fd291c135902bb 36903784186b1b8b4a150dc656eccd49f94e114e CI <CI@example.com> 1643177893 +1100	checkout: moving from 10e171beacb963e4f8a4dc1d80fd291c135902bb to test

test/integration/bisectFromOtherBranch/expected/repo/.git_keep/logs/refs/heads/master

@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 36903784186b1b8b4a150dc656eccd49f94e114e CI <CI@example.com> 1643177881 +1100	commit (initial): first commit

test/integration/bisectFromOtherBranch/expected/repo/.git_keep/logs/refs/heads/other

@@ -1,21 +0,0 @@
-0000000000000000000000000000000000000000 36903784186b1b8b4a150dc656eccd49f94e114e CI <CI@example.com> 1643177881 +1100	branch: Created from HEAD
-36903784186b1b8b4a150dc656eccd49f94e114e 1ab342c03b4226cca1c751dba71fa2df0e7d82ee CI <CI@example.com> 1643177881 +1100	commit: commit 1
-1ab342c03b4226cca1c751dba71fa2df0e7d82ee 15d4c5b8608fe472fd224333e60d44ea826cc80e CI <CI@example.com> 1643177881 +1100	commit: commit 2
-15d4c5b8608fe472fd224333e60d44ea826cc80e b614152a335aabd8b5daa2c6abccc9425eb14177 CI <CI@example.com> 1643177881 +1100	commit: commit 3
-b614152a335aabd8b5daa2c6abccc9425eb14177 1a35564b85e24c96e647b477aaf8d35dcf0de84d CI <CI@example.com> 1643177881 +1100	commit: commit 4
-1a35564b85e24c96e647b477aaf8d35dcf0de84d 11e4fd4011c9ed3800bb33b85580dd1d09f6aefd CI <CI@example.com> 1643177881 +1100	commit: commit 5
-11e4fd4011c9ed3800bb33b85580dd1d09f6aefd 3068d0d730547aaa5b86dbfe638db83133ae1421 CI <CI@example.com> 1643177881 +1100	commit: commit 6
-3068d0d730547aaa5b86dbfe638db83133ae1421 38242e5215bc35b3e418c1d6d63fd0291001e10b CI <CI@example.com> 1643177881 +1100	commit: commit 7
-38242e5215bc35b3e418c1d6d63fd0291001e10b ff231021500c7beb87de0d6d5edc29b6f9c000b1 CI <CI@example.com> 1643177881 +1100	commit: commit 8
-ff231021500c7beb87de0d6d5edc29b6f9c000b1 3fbb9e626d4b7d30e58346b3eefaa342b15ab776 CI <CI@example.com> 1643177881 +1100	commit: commit 9
-3fbb9e626d4b7d30e58346b3eefaa342b15ab776 10e171beacb963e4f8a4dc1d80fd291c135902bb CI <CI@example.com> 1643177881 +1100	commit: commit 10
-10e171beacb963e4f8a4dc1d80fd291c135902bb d84e0684b1038552d5c8d86e67398d634f77ad3b CI <CI@example.com> 1643177882 +1100	commit: commit 11
-d84e0684b1038552d5c8d86e67398d634f77ad3b d27a997859219951ecc95c351174c70ea0cf9d37 CI <CI@example.com> 1643177882 +1100	commit: commit 12
-d27a997859219951ecc95c351174c70ea0cf9d37 3fd9ad29c185eac6106cfa005a3aa594e21b9e06 CI <CI@example.com> 1643177882 +1100	commit: commit 13
-3fd9ad29c185eac6106cfa005a3aa594e21b9e06 b2970eba9fd8dba8655094dc38fb4ee50b9bf23e CI <CI@example.com> 1643177882 +1100	commit: commit 14
-b2970eba9fd8dba8655094dc38fb4ee50b9bf23e 6fa769bf11bd9dc4ff4e85f4951950b0bc34326f CI <CI@example.com> 1643177882 +1100	commit: commit 15
-6fa769bf11bd9dc4ff4e85f4951950b0bc34326f 9c836a5c3f513818d300b410f8cb3a2e3bbd42a1 CI <CI@example.com> 1643177882 +1100	commit: commit 16
-9c836a5c3f513818d300b410f8cb3a2e3bbd42a1 5493d27d38b9902cf28b1035c644bf470df76060 CI <CI@example.com> 1643177882 +1100	commit: commit 17
-5493d27d38b9902cf28b1035c644bf470df76060 0f373801691c466240bd131d28b2168712b045ba CI <CI@example.com> 1643177882 +1100	commit: commit 18
-0f373801691c466240bd131d28b2168712b045ba 333ff293caf2d3216edf22e3f1df64d43a7e1311 CI <CI@example.com> 1643177882 +1100	commit: commit 19
-333ff293caf2d3216edf22e3f1df64d43a7e1311 e559f83c6e8dd11680de70b487725e37ff2e283f CI <CI@example.com> 1643177882 +1100	commit: commit 20

test/integration/bisectFromOtherBranch/expected/repo/.git_keep/logs/refs/heads/test

@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 36903784186b1b8b4a150dc656eccd49f94e114e CI <CI@example.com> 1643177893 +1100	branch: Created from master

test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/0f/373801691c466240bd131d28b2168712b045ba

@@ -1,3 +0,0 @@
-x
�ŽK
-Â0@]ç³d&ŸIE„®zŒÉcK‰àñí¸zðx‹—×Þ(òi쵂ffÒÁ¬Î¤"K("F$SódÙa#“Õ&{}
p6š¢}1!ň:7¡q™­MÍz,Í32*y�ûºÃ¼À4/·ú‘¾=ë%¯ý
-ÄÖ�÷!h8!ªÃS£þ™ÿz  ¾ÇÂ9¹

test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/38/242e5215bc35b3e418c1d6d63fd0291001e10b

@@ -1,2 +0,0 @@
-x
�ÎM
-Â@@a×sŠì™Læ'‚ˆÐU�‘™¤(X[Êß.<€ÛÇ·xm™çG<§CßÌ€«Ç”«†$hM9ØTZl‰ì¬Y	C­Y£'·Êf¯ä3«×B>Å""©rÖ:Y&ÖÊ„Db:y÷û²Á0Âeoö‘y}Ú©-ó0GÂR˜ŽˆÞ»½îSÝþä?Å}
-ø:‹

test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/6f/a769bf11bd9dc4ff4e85f4951950b0bc34326f

@@ -1,3 +0,0 @@
-x
�ÎA
-1@Q×=E÷‚$í´M@D˜•ÇhÚëC�ï,<€ÛÏ[ü²ôþ9ƦjjS©™8ÅX<³£æ
-p°ÕlÖ¼ékXqœ@%s«T%S
xªÅS“I5€°4çÕä÷¸/›�oö<ß®úÉ}}ê©,ýb1NS"röˆ`öºO
ý“ÿ¼Å`¾´Í;w

test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/90/dfebd90b0a89766c39928f22901b8c02b51fda

@@ -1 +0,0 @@
-x
+)JMU03c040031QHËĚIeH¸ĽéË’łńbćŻ(�v˙‹;wçT>·¬âŮÜGł7]ĽćěÝ­ą®<ęơ'=Á
Bâ ˝

test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/9d/33ec0915534bf6401be9412203697791e40a04

@@ -1 +0,0 @@
-x
+)JMU03c040031QHֻּIeאש‎¡£םֺֿ•2�ƒ�´›�נ?‎Tg>T>·¬ג��G³7]¼זל�­¹®<ךֶ¡'=ֱ
Gֶ »

test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/b6/14152a335aabd8b5daa2c6abccc9425eb14177

@@ -1,2 +0,0 @@
-x
�ŽK
-1]çÙÒ�ÎD„YyŒ¤ÓAÁ8ÃÁã›…p[T=¯½?†ÆäcÑ”ÁIEÎÉ,LÞpÀ¤@*µ¶8!‚Úò.¯ºjÙ•è!6±Á´jŒ%"ñP­•�gŽ *¿Ç}ÝõrÓçåv•OîÛSN¼ö‹Fo	CˆõqNƒštžò§þó5©/o:`

test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d2/7a997859219951ecc95c351174c70ea0cf9d37

@@ -1,3 +0,0 @@
-x
�ŽM
-Â0F]ç³$“ß)ºê1’ÌcK‰àñ͸|��W¶Öp
-§~ˆ@,•=JfE©upÊÆ¡±Þj_rpvb§Õžyu`r¢¹ŒÚ’÷†}!¦ !Ú‰8XWcLl³Jï~ßXV˜—õ&ŸÔö§\ÊÖ®€ãc$2pFÔZ�uDuùSÿù€F}
W´:†

test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/d3/6e09d97bf2c1527118bde353ad64b157f8b269

@@ -1 +0,0 @@
-x
+)JMU03c040031QHËÌIe¸À2ño]ô¶_GÅì6Ú±•-x®/T>·¬âÙÜG³7]¼æìÝ­¹®<êÆ¡'=Á
5

test/integration/bisectFromOtherBranch/expected/repo/.git_keep/objects/e5/59f83c6e8dd11680de70b487725e37ff2e283f

@@ -1,3 +0,0 @@
-x
�ŽA
-Â0E]ç³$3“&)ˆ]õc2ƒ‚µ¥Dðøfá
\¾Ïãóʺ,�8ÆCÛUÁC²¸
-ç!&õ>3êxël•ŠT¢Øm²ë«
3›ÑÈEŒ*F­F¤lX-†X’"#:y·ûºÃ4Ãyš¯ú‘e{ꩬË°ÿaJ9½w}íQMÿÔ>�w_?R:’

test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/bisect/bad

@@ -1 +0,0 @@
-10e171beacb963e4f8a4dc1d80fd291c135902bb

test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/bisect/good-38242e5215bc35b3e418c1d6d63fd0291001e10b

@@ -1 +0,0 @@
-38242e5215bc35b3e418c1d6d63fd0291001e10b

test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/bisect/good-3fbb9e626d4b7d30e58346b3eefaa342b15ab776

@@ -1 +0,0 @@
-3fbb9e626d4b7d30e58346b3eefaa342b15ab776

test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/heads/master

@@ -1 +0,0 @@
-36903784186b1b8b4a150dc656eccd49f94e114e

test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/heads/other

@@ -1 +0,0 @@
-e559f83c6e8dd11680de70b487725e37ff2e283f

test/integration/bisectFromOtherBranch/expected/repo/.git_keep/refs/heads/test

@@ -1 +0,0 @@
-36903784186b1b8b4a150dc656eccd49f94e114e

test/integration/bisectFromOtherBranch/recording.json

@@ -1 +0,0 @@
-{"KeyEvents":[{"Timestamp":661,"Mod":0,"Key":259,"Ch":0},{"Timestamp":925,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1238,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1398,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1535,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1677,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1823,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1941,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2261,"Mod":0,"Key":256,"Ch":98},{"Timestamp":2910,"Mod":0,"Key":13,"Ch":13},{"Timestamp":3564,"Mod":0,"Key":256,"Ch":98},{"Timestamp":3949,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4214,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4869,"Mod":0,"Key":256,"Ch":98},{"Timestamp":5229,"Mod":0,"Key":257,"Ch":0},{"Timestamp":5582,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6590,"Mod":0,"Key":256,"Ch":98},{"Timestamp":7325,"Mod":0,"Key":13,"Ch":13},{"Timestamp":9003,"Mod":0,"Key":27,"Ch":0},{"Timestamp":9341,"Mod":0,"Key":260,"Ch":0},{"Timestamp":10141,"Mod":0,"Key":256,"Ch":110},{"Timestamp":10413,"Mod":0,"Key":256,"Ch":116},{"Timestamp":10452,"Mod":0,"Key":256,"Ch":101},{"Timestamp":10629,"Mod":0,"Key":256,"Ch":115},{"Timestamp":10660,"Mod":0,"Key":256,"Ch":116},{"Timestamp":10854,"Mod":0,"Key":13,"Ch":13},{"Timestamp":11637,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}

test/integration/bisectFromOtherBranch/setup.sh

@@ -1,27 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $1
-
-git init
-
-git config user.email "CI@example.com"
-git config user.name "CI"
-
-touch myfile
-git add myfile
-git commit -m "first commit"
-
-git checkout -b other
-
-for i in {1..20}
-do
-  echo "$i" > file
-  git add .
-  git commit -m "commit $i"
-done
-
-git checkout master
-
-git bisect start other~2 other~13

test/integration/bisectFromOtherBranch/test.json

@@ -1,4 +0,0 @@
-{
-  "description": "Opening lazygit when bisect has been started from another branch. There's an issue where we don't reselect the current branch if we mark the current branch as bad so this test side-steps that problem",
-  "speed": 20
-}

test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/COMMIT_EDITMSG

@@ -0,0 +1 @@
+commit 10

test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/master

test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/config

@@ -8,3 +8,5 @@
 [user]
 	email = CI@example.com
 	name = CI
+[commit]
+	gpgSign = false

test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/logs/HEAD

@@ -0,0 +1,15 @@
+0000000000000000000000000000000000000000 5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d CI <CI@example.com> 1661161824 +1000	commit (initial): only commit on master
+5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d 5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d CI <CI@example.com> 1661161824 +1000	checkout: moving from master to other
+5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d e739ef9112312917b4fc678e40e2372cc8fda25f CI <CI@example.com> 1661161824 +1000	commit: commit 01
+e739ef9112312917b4fc678e40e2372cc8fda25f 0d4e099996a7c3dc58120cfe1ec34973b309d0e0 CI <CI@example.com> 1661161824 +1000	commit: commit 02
+0d4e099996a7c3dc58120cfe1ec34973b309d0e0 3a899150d167edb02f0ef2ab43bf446d23d90310 CI <CI@example.com> 1661161824 +1000	commit: commit 03
+3a899150d167edb02f0ef2ab43bf446d23d90310 7f8a9a8381ae3fe82a0c43385d3a5bb25cf90699 CI <CI@example.com> 1661161824 +1000	commit: commit 04
+7f8a9a8381ae3fe82a0c43385d3a5bb25cf90699 d4779d400f252d1de4e76ef79e3b4d554fffadb5 CI <CI@example.com> 1661161824 +1000	commit: commit 05
+d4779d400f252d1de4e76ef79e3b4d554fffadb5 41bffcc8f25d268518574e91483a55e66124574c CI <CI@example.com> 1661161824 +1000	commit: commit 06
+41bffcc8f25d268518574e91483a55e66124574c 5c9b8a0a95c49c1674753ad827246ce05965e7fe CI <CI@example.com> 1661161824 +1000	commit: commit 07
+5c9b8a0a95c49c1674753ad827246ce05965e7fe 9cdece2525ed2b34f940b168a2f628984468a8c6 CI <CI@example.com> 1661161824 +1000	commit: commit 08
+9cdece2525ed2b34f940b168a2f628984468a8c6 e4fca3fab85b7a477a2de101e917fe43538e0302 CI <CI@example.com> 1661161824 +1000	commit: commit 09
+e4fca3fab85b7a477a2de101e917fe43538e0302 dff71e43e297a66eb7ec85b7b95ece827751cdbd CI <CI@example.com> 1661161824 +1000	commit: commit 10
+dff71e43e297a66eb7ec85b7b95ece827751cdbd 5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d CI <CI@example.com> 1661161824 +1000	checkout: moving from other to master
+5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d 5c9b8a0a95c49c1674753ad827246ce05965e7fe CI <CI@example.com> 1661161824 +1000	checkout: moving from master to 5c9b8a0a95c49c1674753ad827246ce05965e7fe
+5c9b8a0a95c49c1674753ad827246ce05965e7fe 5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d CI <CI@example.com> 1661161825 +1000	checkout: moving from 5c9b8a0a95c49c1674753ad827246ce05965e7fe to master

test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/logs/refs/heads/master

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d CI <CI@example.com> 1661161824 +1000	commit (initial): only commit on master

test/integration_new/bisect/from_other_branch/expected/repo/.git_keep/logs/refs/heads/other

@@ -0,0 +1,11 @@
+0000000000000000000000000000000000000000 5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d CI <CI@example.com> 1661161824 +1000	branch: Created from HEAD
+5f80f6e6bd2410efe5b5f613adc5b4fcf50e930d e739ef9112312917b4fc678e40e2372cc8fda25f CI <CI@example.com> 1661161824 +1000	commit: commit 01
+e739ef9112312917b4fc678e40e2372cc8fda25f 0d4e099996a7c3dc58120cfe1ec34973b309d0e0 CI <CI@example.com> 1661161824 +1000	commit: commit 02
+0d4e099996a7c3dc58120cfe1ec34973b309d0e0 3a899150d167edb02f0ef2ab43bf446d23d90310 CI <CI@example.com> 1661161824 +1000	commit: commit 03
+3a899150d167edb02f0ef2ab43bf446d23d90310 7f8a9a8381ae3fe82a0c43385d3a5bb25cf90699 CI <CI@example.com> 1661161824 +1000	commit: commit 04
+7f8a9a8381ae3fe82a0c43385d3a5bb25cf90699 d4779d400f252d1de4e76ef79e3b4d554fffadb5 CI <CI@example.com> 1661161824 +1000	commit: commit 05
+d4779d400f252d1de4e76ef79e3b4d554fffadb5 41bffcc8f25d268518574e91483a55e66124574c CI <CI@example.com> 1661161824 +1000	commit: commit 06
+41bffcc8f25d268518574e91483a55e66124574c 5c9b8a0a95c49c1674753ad827246ce05965e7fe CI <CI@example.com> 1661161824 +1000	commit: commit 07
+5c9b8a0a95c49c1674753ad827246ce05965e7fe 9cdece2525ed2b34f940b168a2f628984468a8c6 CI <CI@example.com> 1661161824 +1000	commit: commit 08
+9cdece2525ed2b34f940b168a2f628984468a8c6 e4fca3fab85b7a477a2de101e917fe43538e0302 CI <CI@example.com> 1661161824 +1000	commit: commit 09
+e4fca3fab85b7a477a2de101e917fe43538e0302 dff71e43e297a66eb7ec85b7b95ece827751cdbd CI <CI@example.com> 1661161824 +1000	commit: commit 10