APZelos / blamer.nvim

A git blame plugin for neovim inspired by VS Code's GitLens plugin
MIT License
729 stars 33 forks source link

Not compatible with vim-fugitive & git-messenger #30

Open weiguoz opened 3 years ago

weiguoz commented 3 years ago

I'm using tpope/vim-fugitive & rhysd/git-messenger.vim, when I add blamer.nvim and type the commands like :GitMessage or :Git log, the vim(8.2) throw out an error: E315: ml_get: invalid lnum.

APZelos commented 3 years ago

I don't use fugitive at the moment. I may try to check it out if I find some time

georgesofianosgr commented 3 years ago

I tried vim 8.2 with blamer,fugitive,git-messenger but I could not reproduce the problem. Is this issue still valid ?

reybeamde commented 3 years ago

I still have a problem when using :Gstatus. If i use cc to enter a commit message or g? to show help, the error still occurs. (vim 8.2)

georgesofianosgr commented 3 years ago

I created this minimal config for vim 8.2 in my test, which doesn't produce any errors.

set nocp

call plug#begin('~/.local/share/vim/plugged')
Plug 'APZelos/blamer.nvim'
Plug 'tpope/vim-fugitive' 
Plug 'rhysd/git-messenger.vim'
call plug#end()

let g:blamer_enabled = 1
let g:blamer_delay = 500
let g:blamer_relative_time = 1
let g:blamer_show_in_visual_modes = 1
let g:blamer_show_in_insert_modes = 0

Can you try with the same config and let me know if it still produces errors ? Also does :GitMessage & :Git log produces the same error as OP ?

reybeamde commented 3 years ago

I tested it with your minimal config and the error still occurs, but not always. "normal" commit messages are not a problem, but if i was in a merge conflict, resolved all conflict and want to commit, the error occurs.

E315: ml_get: invalid lnum: 35
E315: ml_get: invalid lnum: 36 .... E315: ml_get: invalid lnum: 45

I think something get messed up with the removed line numbers. The current document has only 34 lines, after resolving all conflicts. With the conflict markers '<<<<<' and '>>>>>>' 46 lines exists.

Hope it helps