diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-15 13:29:28 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-15 14:15:41 +1100 |
| commit | 8d8bdb948b089250c22f3ac4f549152a209dcdb2 (patch) | |
| tree | 3687ba082abe7322fe5c77c452b618c7b5e6e2e2 /pkg/gui/diff_context_size_test.go | |
| parent | cdcfeb396fda1e61dee9b6d88ab4659152a10948 (diff) | |
avoid deadlock in merge panel
Diffstat (limited to 'pkg/gui/diff_context_size_test.go')
| -rw-r--r-- | pkg/gui/diff_context_size_test.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkg/gui/diff_context_size_test.go b/pkg/gui/diff_context_size_test.go index 11bd0712b..b459e40d0 100644 --- a/pkg/gui/diff_context_size_test.go +++ b/pkg/gui/diff_context_size_test.go @@ -65,7 +65,9 @@ func TestDoesntIncreaseContextInDiffViewInContextWithoutDiff(t *testing.T) { func(gui *Gui) Context { return gui.State.Contexts.ReflogCommits }, func(gui *Gui) Context { return gui.State.Contexts.RemoteBranches }, func(gui *Gui) Context { return gui.State.Contexts.Tags }, - func(gui *Gui) Context { return gui.State.Contexts.Merging }, + // not testing this because it will kick straight back to the files context + // upon pushing the context + // func(gui *Gui) Context { return gui.State.Contexts.Merging }, func(gui *Gui) Context { return gui.State.Contexts.CommandLog }, } @@ -115,7 +117,9 @@ func TestDoesntDecreaseContextInDiffViewInContextWithoutDiff(t *testing.T) { func(gui *Gui) Context { return gui.State.Contexts.ReflogCommits }, func(gui *Gui) Context { return gui.State.Contexts.RemoteBranches }, func(gui *Gui) Context { return gui.State.Contexts.Tags }, - func(gui *Gui) Context { return gui.State.Contexts.Merging }, + // not testing this because it will kick straight back to the files context + // upon pushing the context + // func(gui *Gui) Context { return gui.State.Contexts.Merging }, func(gui *Gui) Context { return gui.State.Contexts.CommandLog }, } |