Cherry picking errors
Nobody has claimed this yet.
- Dominant language
- Lua
- Stars
- 5.6k
- Forks
- 357
- Avg merge
- 15h 47m
- Merged PRs (30d)
- 2
Description
Description
I'm trying to figure out how to do cherry picking with neogit but I get a lot of errors.
I press A twice and then choose commit with enter. and I see a lot of errors on the screen
Here is the log
1 git cherry-pick --ff 6b0115591773b248f80e95137aea0a8c8e789b82 (38.000 ms) [stderr 7]
| 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'
|
Neovim version
NVIM v0.9.1
Build type: Release
LuaJIT 2.1.0-beta3
Operating system and version
macOS 13.4.1 (22F82)
Steps to reproduce
Open repo
Press A twice
Press enter on the commit
Expected behavior
No response
Actual behavior
Cherry picking doesn't work or I don't understand how does it work.
Minimal config
vim.cmd([[set runtimepath=$VIMRUNTIME]])
vim.cmd([[set packpath=/tmp/nvim/site]])
local package_root = "/tmp/nvim/site/pack"
local install_path = package_root .. "/packer/start/packer.nvim"
local function load_plugins()
require("packer").startup({
{
"wbthomason/packer.nvim",
{
"TimUntersberger/neogit",
requires = {
{ "nvim-lua/plenary.nvim" },
{ "sindrets/diffview.nvim" },
},
config = function()
print("loaded neogit")
require("neogit").setup()
end,
},
},
config = {
package_root = package_root,
compile_path = install_path .. "/plugin/packer_compiled.lua",
display = { non_interactive = true },
},
})
end
if vim.fn.isdirectory(install_path) == 0 then
print("Installing neogit and dependencies.")
vim.fn.system({ "git", "clone", "--depth=1", "https://github.com/wbthomason/packer.nvim", install_path })
end
load_plugins()
require("packer").sync()
Contributor guide
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
Research direction
No source file or test is named in the issue. Start by reproducing the reported sequence—open a repository, press A twice, and select a commit—then inspect the displayed git cherry-pick --ff output and the surrounding issue discussion. Done means the cherry-pick flow is either corrected or its expected use and handling of an empty cherry-pick are clearly documented.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- git, lua, neovim
- Domain
- cli, devtools
- Issue type
- Bug
- Difficulty
- 3/5
- Estimated time
- 1-2 days
- Activity status
- Stale
- Clarity
- Needs clarification
- Newbie friendliness
- 25/100