m-vim_plugins/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-11-11 04:53:45 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Associate conflicted files with relevant commits

Browse Source
This commit is contained in:
Tim Pope
2018-10-12 15:14:49 -04:00
parent a9100fafb8
commit 7fae98f263
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
autoload/fugitive.vim
View File

@@ -485,8 +485,24 @@ function! s:Owner(path, ...) abort
return '' return ''
endif endif
let [pdir, commit, file] = s:DirCommitFile(a:path) let [pdir, commit, file] = s:DirCommitFile(a:path)
if s:cpath(dir, pdir) && commit =~# '^\x\{40\}$' if s:cpath(dir, pdir)
return commit if commit =~# '^\x\{40\}$'
return commit
elseif commit ==# '2'
return 'HEAD^{}'
endif
if filereadable(dir . '/MERGE_HEAD')
let merge_head = 'MERGE_HEAD'
elseif filereadable(dir . '/REBASE_HEAD')
let merge_head = 'REBASE_HEAD'
else
return ''
endif
if commit ==# '3'
return merge_head . '^{}'
elseif commit ==# '1'
return s:TreeChomp('merge-base', 'HEAD', merge_head, '--')
endif
endif endif
let path = fnamemodify(a:path, ':p') let path = fnamemodify(a:path, ':p')
if s:cpath(dir . '/', path[0 : len(dir)]) && a:path =~# 'HEAD$' if s:cpath(dir . '/', path[0 : len(dir)]) && a:path =~# 'HEAD$'