From 4067eef9132fcbcc590b5cbf92f54b9e53dc2494 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 1 Mar 2024 15:46:42 +0800 Subject: [PATCH] fix(git): fix delete_branch function && check bufnr --- bundle/git.vim/lua/git/ui/branch.lua | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bundle/git.vim/lua/git/ui/branch.lua b/bundle/git.vim/lua/git/ui/branch.lua index 7947fcd78..a8028638e 100644 --- a/bundle/git.vim/lua/git/ui/branch.lua +++ b/bundle/git.vim/lua/git/ui/branch.lua @@ -25,10 +25,11 @@ local function update_buffer_context() end table.insert(context, ' ' .. b.name) end - - vim.api.nvim_buf_set_option(branch_manager_bufnr, 'modifiable', true) - vim.api.nvim_buf_set_lines(branch_manager_bufnr, 0, -1, false, context) - vim.api.nvim_buf_set_option(branch_manager_bufnr, 'modifiable', false) + if branch_manager_bufnr ~= -1 and vim.api.nvim_buf_is_valid(branch_manager_bufnr) then + vim.api.nvim_buf_set_option(branch_manager_bufnr, 'modifiable', true) + vim.api.nvim_buf_set_lines(branch_manager_bufnr, 0, -1, false, context) + vim.api.nvim_buf_set_option(branch_manager_bufnr, 'modifiable', false) + end end local function on_stdout(id, data) @@ -97,7 +98,7 @@ local function delete_branch() if vim.startswith(line, ' * ') then elseif vim.startswith(line, ' ') then local branch = vim.trim(line) - vim.cmd('Git checkout -d ' .. branch) + vim.cmd('Git branch -d ' .. branch) end end end