motiejus/dotfiles

commit a0c71a6d4cb3b576ebbe42a270c8c48cbb23d185 (tree)
parent 0abe1fb12232abe5b7bdfa4d244f04faf3450ba3
Author: Tim Pope <code@tpope.net>
Date:   Wed, 15 Aug 2012 11:22:40 -0400

Fix :Gstatus dd on unmerged path

Closes #240.

Diffstat:
M
plugin/fugitive.vim
 | 
2
++

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