jesseduffield / jesseduffield/lazygit

Crashes during merge conflict resolve

Open
#1,149 5 comments 0 reactions 0 assignees View on GitHub
bug
Dominant language
Go
Stars
82.4k
Forks
3k
Avg merge
2d 18h
Merged PRs (30d)
19

Description

**Describe the bug**
Merging created a conflict and when selecting a diff in the files panel, it crashes.

**To Reproduce**
Steps to reproduce the behavior:

unsure, since i have done these steps before.

**Expected behavior**
Should not crash.

**Screenshots**

2021/01/26 11:16:35 An error occurred! Please create an issue at https://github.com/jesseduffield/lazygit/issues

*errors.errorString fatal: Unable to create 'xxxxxxxxxx/.git/index.lock': File exists.

Another git process seems to be running in this repository, e.g.
an editor opened by 'git commit'. Please make sure all processes
are terminated then try again. If it still fails, a git process
may have crashed in this repository earlier:
remove the file manually to continue.

/build/lazygit-asRDrs/lazygit-0.24.2/obj-x86_64-linux-gnu/src/github.com/jesseduffield/lazygit/pkg/commands/oscommands/os.go:206 (0x610784)
/build/lazygit-asRDrs/lazygit-0.24.2/obj-x86_64-linux-gnu/src/github.com/jesseduffield/lazygit/pkg/commands/oscommands/os.go:97 (0x60fb1d)
/build/lazygit-asRDrs/lazygit-0.24.2/obj-x86_64-linux-gnu/src/github.com/jesseduffield/lazygit/pkg/commands/oscommands/os.go:172 (0x610333)
/build/lazygit-asRDrs/lazygit-0.24.2/obj-x86_64-linux-gnu/src/github.com/jesseduffield/lazygit/pkg/commands/files.go:25 (0x90356e)
/build/lazygit-asRDrs/lazygit-0.24.2/obj-x86_64-linux-gnu/src/github.com/jesseduffield/lazygit/pkg/gui/files_panel.go:161 (0x937182)
/build/lazygit-asRDrs/lazygit-0.24.2/obj-x86_64-linux-gnu/src/github.com/jesseduffield/lazygit/pkg/gui/merge_panel.go:318 (0x969bcf)
/build/lazygit-asRDrs/lazygit-0.24.2/obj-x86_64-linux-gnu/src/github.com/jesseduffield/lazygit/pkg/gui/merge_panel.go:230 (0x968eac)
/build/lazygit-asRDrs/lazygit-0.24.2/obj-x86_64-linux-gnu/src/github.com/jesseduffield/lazygit/pkg/gui/files_panel.go:57 (0x936a6e)
/build/lazygit-asRDrs/lazygit-0.24.2/obj-x86_64-linux-gnu/src/github.com/jesseduffield/lazygit/pkg/gui/files_panel.go:228 (0x937760)
/build/lazygit-asRDrs/lazygit-0.24.2/obj-x86_64-linux-gnu/src/github.com/jesseduffield/lazygit/pkg/gui/list_context.go:267 (0x9982fa)
/build/lazygit-asRDrs/lazygit-0.24.2/obj-x86_64-linux-gnu/src/github.com/jesseduffield/lazygit/pkg/gui/list_context.go:136 (0x960a4f)
/build/lazygit-asRDrs/lazygit-0.24.2/obj-x86_64-linux-gnu/src/github.com/jesseduffield/lazygit/pkg/gui/list_context.go:181 (0x960e5d)
/build/lazygit-asRDrs/lazygit-0.24.2/obj-x86_64-linux-gnu/src/github.com/jesseduffield/lazygit/pkg/gui/list_context.go:151 (0x960c74)
/build/lazygit-asRDrs/lazygit-0.24.2/obj-x86_64-linux-gnu/src/github.com/jesseduffield/lazygit/pkg/gui/list_context.go:531 (0x9986ee)
/build/lazygit-asRDrs/lazygit-0.24.2/obj-x86_64-linux-gnu/src/github.com/jesseduffield/lazygit/vendor/github.com/jesseduffield/gocui/gui.go:963 (0x8f53ee)
/build/lazygit-asRDrs/lazygit-0.24.2/obj-x86_64-linux-gnu/src/github.com/jesseduffield/lazygit/vendor/github.com/jesseduffield/gocui/gui.go:943 (0x8f5079)
/build/lazygit-asRDrs/lazygit-0.24.2/obj-x86_64-linux-gnu/src/github.com/jesseduffield/lazygit/vendor/github.com/jesseduffield/gocui/gui.go:863 (0x8f4dd2)
/build/lazygit-asRDrs/lazygit-0.24.2/obj-x86_64-linux-gnu/src/github.com/jesseduffield/lazygit/vendor/github.com/jesseduffield/gocui/gui.go:551 (0x8f35b8)
/build/lazygit-asRDrs/lazygit-0.24.2/obj-x86_64-linux-gnu/src/github.com/jesseduffield/lazygit/vendor/github.com/jesseduffield/gocui/gui.go:499 (0x8f30f2)
/build/lazygit-asRDrs/lazygit-0.24.2/obj-x86_64-linux-gnu/src/github.com/jesseduffield/lazygit/pkg/gui/gui.go:504 (0x93f29d)
/build/lazygit-asRDrs/lazygit-0.24.2/obj-x86_64-linux-gnu/src/github.com/jesseduffield/lazygit/pkg/gui/gui.go:517 (0x93f729)
/build/lazygit-asRDrs/lazygit-0.24.2/obj-x86_64-linux-gnu/src/github.com/jesseduffield/lazygit/pkg/app/app.go:240 (0x99ce64)
/build/lazygit-asRDrs/lazygit-0.24.2/obj-x86_64-linux-gnu/src/github.com/jesseduffield/lazygit/main.go:126 (0x99e8c3)
/usr/lib/go-1.10/src/runtime/proc.go:198 (0x42cec2)
/usr/lib/go-1.10/src/runtime/asm_amd64.s:2361 (0x458121)

**Desktop (please complete the following information):**
- OS: Windows with WSL1 (legacy)
- Lazygit Version 0.24.2
- The last commit id if you built project from sources (run : ```git-rev parse HEAD```)

**Additional context**
There are no additional git processes running, when starting lazygit so it must be creating the lock itself during the merge/conflict resolving.
If i remove the lock, and restart the merge/conflict it still crashes in the same way.

Contributor guide

Open the contributing guide

Assessment

This issue has not been assessed yet.

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.