sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

Insert fake todo entry for a conflicting commit that is being applied

Browse Source 
When stopping in a rebase because of a conflict, it is nice to see the commit
that git is trying to apply. Create a fake todo entry labelled "conflict" for
this, and show the "<-- YOU ARE HERE ---" string for that one (in red) instead
of for the real current head.
This commit is contained in:
Stefan Haller
2023-02-26 11:51:02 +01:00
parent d66ca7751c
commit 3928d0ebda
12 changed files with 357 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/integration/tests/interactive_rebase/amend_commit_with_conflict.go
View File

@ -35,8 +35,8 @@ var AmendCommitWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
}).
Lines(
Contains("pick").Contains("three"),
// Would be nice to see "fixup! two" here, because that's what git is trying to apply right now
Contains("<-- YOU ARE HERE --- two"),
Contains("conflict").Contains("<-- YOU ARE HERE --- fixup! two"),
Contains("two"),
Contains("one"),
)
@ -66,8 +66,8 @@ var AmendCommitWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Commits().
Lines(
// Would be nice to see "three" here, because that's what git is trying to apply right now
Contains("<-- YOU ARE HERE --- two"),
Contains("<-- YOU ARE HERE --- three"),
Contains("two"),
Contains("one"),
)
},