sanchayanmaity/dotfiles
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Revert "nvim: autoload/git: Fix git log when current branch is master/main"

Browse source 
This reverts commit da5671b5ae.

The commit actually did not handle all cases correctly.
This commit is contained in:
Sanchayan Maity 2022-02-19 14:13:38 +05:30
parent 2776d00572
commit 96bc70fff8
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
nvim/.config/nvim/autoload/git.vim
View file

@ -47,13 +47,9 @@ endfunction
function! git#git_branch_log() abort function! git#git_branch_log() abort
let line = trim(getline('.')) let line = trim(getline('.'))
let branch = split(line, "/") let branch = split(line, "/")
let current = trim(system('git branch --show-current'))
" Close the buffer opened by Git branch -a " Close the buffer opened by Git branch -a
silent execute "bw" silent execute "bw"
if current == "master" || current == "main" if len(branch) == 1
" Handles the case for checked out main/master branch
execute "Git log " . current
elseif len(branch) == 1
" Handles the case for local branch " Handles the case for local branch
execute "Git log " . branch[0] execute "Git log " . branch[0]
else else
@ -69,13 +65,9 @@ endfunction
function! git#git_branch_log_pretty() abort function! git#git_branch_log_pretty() abort
let line = trim(getline('.')) let line = trim(getline('.'))
let branch = split(line, "/") let branch = split(line, "/")
let current = trim(system('git branch --show-current'))
" Close the buffer opened by Git branch -a " Close the buffer opened by Git branch -a
silent execute "bw" silent execute "bw"
if current == "master" || current == "main" if len(branch) == 1
" Handles the case for checked out main/master branch
execute "Git log " . current
elseif len(branch) == 1
" Handles the case for local branch " Handles the case for local branch
execute "Git log --pretty=oneline --no-merges " . branch[0] execute "Git log --pretty=oneline --no-merges " . branch[0]
else else