Cherry-pick gets lazygit stuck when commit is empty

[yotambarnoy]

Describe the bug
I love lazygit!
When cherry-picking many commits, I suddenly got lazygit to freeze. I opened a terminal and saw that git cherry-pick was telling me there was a commit that no longer had content, and I had the option to git cherry-pick --skip or to keep an empty commit. I'm guessing lazygit didn't anticipate this git state.

Expected behavior
Giving options to deal with the new state

Version info:
0.53.0 from homebrew
git version 2.34.1

[stefanhaller]

I'll look into this, but I guess this only fails for git versions older than 2.45. From that version on, we pass the --keep-redundant-commits argument to git cherry-pick, which makes this work. So my recommendation is to update to the latest git version.

[efussi]

I am seeing the same issue with git 2.51.0 on Ubuntu 24.04. Switching to the command line after lazygit 0.55.1 froze shows this:

$ git cherry-pick --continue
On branch test
You are currently cherry-picking commit fe822c67b.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'

Here is a screenshot of the frozen lazygit GUI:

Running git cherry-pick --skip from the command line and killing the lazygit process fixes the issue and everything works fine again.

[stefanhaller]

I am seeing the same issue with git 2.51.0 on Ubuntu 24.04.

@efussi It took me a while to realize how your case differs from the OP's, and why it still fails with git 2.51 for you. Here's a fix that resolves both problems, in case you want to test it: #4958.