sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-31 14:24:25 +03:00
Code Activity

Remove the "YOU ARE HERE" marker

Browse Source 
Now that we have sections, it is no longer needed.

Keep the "<-- CONFLICTS" marker though.
This commit is contained in:
Stefan Haller
2025-04-05 13:43:50 +02:00
parent 6cbc1e0ace
commit 74054c9d70
37 changed files with 75 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/integration/tests/interactive_rebase/rebase.go
View File

@ -40,7 +40,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
MatchesRegexp("pick.*second commit to edit"),
MatchesRegexp("pick.*commit to squash"),
Contains("--- Commits ---"),
MatchesRegexp("YOU ARE HERE.*first commit to edit").IsSelected(),
Contains("first commit to edit").IsSelected(),
Contains("initial commit"),
).
SelectPreviousItem().
@ -52,7 +52,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
MatchesRegexp("pick.*second commit to edit"),
MatchesRegexp("squash.*commit to squash").IsSelected(),
Contains("--- Commits ---"),
MatchesRegexp("YOU ARE HERE.*first commit to edit"),
Contains("first commit to edit"),
Contains("initial commit"),
).
SelectPreviousItem().
@ -64,7 +64,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
MatchesRegexp("edit.*second commit to edit").IsSelected(),
MatchesRegexp("squash.*commit to squash"),
Contains("--- Commits ---"),
MatchesRegexp("YOU ARE HERE.*first commit to edit"),
Contains("first commit to edit"),
Contains("initial commit"),
).
SelectPreviousItem().
@ -76,7 +76,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
MatchesRegexp("edit.*second commit to edit"),
MatchesRegexp("squash.*commit to squash"),
Contains("--- Commits ---"),
MatchesRegexp("YOU ARE HERE.*first commit to edit"),
Contains("first commit to edit"),
Contains("initial commit"),
).
SelectPreviousItem().
@ -88,7 +88,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
MatchesRegexp("edit.*second commit to edit"),
MatchesRegexp("squash.*commit to squash"),
Contains("--- Commits ---"),
MatchesRegexp("YOU ARE HERE.*first commit to edit"),
Contains("first commit to edit"),
Contains("initial commit"),
).
Tap(func() {
@ -99,7 +99,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
MatchesRegexp("fixup.*commit to fixup").IsSelected(),
MatchesRegexp("drop.*commit to drop"),
Contains("--- Commits ---"),
MatchesRegexp("YOU ARE HERE.*second commit to edit"),
Contains("second commit to edit"),
MatchesRegexp("first commit to edit"),
Contains("initial commit"),
).