search

jesseduffield / lazygit

simple terminal UI for git commands
MIT License
47.94k stars 1.72k forks source link

Error when deleting merge commit #3698

Closed OliverJAsh closed 4 days ago

OliverJAsh commented 4 days ago

Describe the bug Error when deleting merge commit.

To Reproduce Steps to reproduce the behavior:

  1. Try to delete a merge commit

Expected behavior The deletion works.

Screenshots

https://github.com/jesseduffield/lazygit/assets/921609/67013f2b-85bb-4d6b-b068-f4422f1b3bf5

Version info:

commit=, build date=, build source=nix, version=0.42.0, os=darwin, arch=arm64, git version=2.45.1
git version 2.45.1

Additional context

Note: please try updating to the latest version or manually building the latest master to see if the issue still occurs.

mark2185 commented 4 days ago

Just to confirm, dropping non-merge commits works?

stefanhaller commented 4 days ago

This is a duplicate of #3164, and there's some explanation there. (The paragraph with the suggested workaround is out of date, we no longer allow that.)

I could have sworn we added code to disallow dropping merges outside of a rebase, but I must have dreamed that.