From da5671b5ae55085e59aa7852dd5210e35314ac8f Mon Sep 17 00:00:00 2001 From: Sanchayan Maity Date: Thu, 10 Feb 2022 12:52:01 +0530 Subject: [PATCH] nvim: autoload/git: Fix git log when current branch is master/main --- nvim/.config/nvim/autoload/git.vim | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/nvim/.config/nvim/autoload/git.vim b/nvim/.config/nvim/autoload/git.vim index 1cf57ae..1fd64dc 100644 --- a/nvim/.config/nvim/autoload/git.vim +++ b/nvim/.config/nvim/autoload/git.vim @@ -47,9 +47,13 @@ endfunction function! git#git_branch_log() abort let line = trim(getline('.')) let branch = split(line, "/") + let current = trim(system('git branch --show-current')) " Close the buffer opened by Git branch -a silent execute "bw" - if len(branch) == 1 + if current == "master" || current == "main" + " Handles the case for checked out main/master branch + execute "Git log " . current + elseif len(branch) == 1 " Handles the case for local branch execute "Git log " . branch[0] else @@ -65,9 +69,13 @@ endfunction function! git#git_branch_log_pretty() abort let line = trim(getline('.')) let branch = split(line, "/") + let current = trim(system('git branch --show-current')) " Close the buffer opened by Git branch -a silent execute "bw" - if len(branch) == 1 + if current == "master" || current == "main" + " Handles the case for checked out main/master branch + execute "Git log " . current + elseif len(branch) == 1 " Handles the case for local branch execute "Git log --pretty=oneline --no-merges " . branch[0] else