vim/vim-fugitive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix :Gstatus dd on unmerged path

Browse Source 
Closes #240.
This commit is contained in:
Tim Pope 2012-08-15 11:22:40 -04:00
parent 0abe1fb122
commit a0c71a6d4c
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/fugitive.vim
View File

@ -691,6 +691,8 @@ function! s:stage_info(lnum) abort
return [matchstr(filename, ': *\zs.*'), 'staged'] return [matchstr(filename, ': *\zs.*'), 'staged']
elseif getline(lnum+2) =~# '^# .*"git checkout ' || getline(lnum) ==# '# Changes not staged for commit:' elseif getline(lnum+2) =~# '^# .*"git checkout ' || getline(lnum) ==# '# Changes not staged for commit:'
return [matchstr(filename, ': *\zs.*'), 'unstaged'] return [matchstr(filename, ': *\zs.*'), 'unstaged']
elseif getline(lnum+1) =~# '^# .*"git add/rm ' || getline(lnum) ==# '# Unmerged paths:'
return [matchstr(filename, ': *\zs.*'), 'unmerged']
else else
return [filename, 'untracked'] return [filename, 'untracked']
endif endif