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

Don't assume FugitiveGitDir() is actual directory

Browse Source 
This is currently a valid assumption, but it boxes us in.  Instead use
fugitive#Find('.git/'), which is guaranteed to return a path to an
actual directory.

Also use fugitive#Find('.git/refs/..') to determine the common
directory.
This commit is contained in:
Tim Pope
2021-07-02 23:42:13 -04:00
parent 0ec3bb2bdd
commit b498607aa7
2 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
autoload/fugitive.vim
View File

@@ -1109,19 +1109,20 @@ function! fugitive#Find(object, ...) abort
if rev ==# '.git' if rev ==# '.git'
let f = len(tree) ? tree . '/.git' : dir let f = len(tree) ? tree . '/.git' : dir
elseif rev =~# '^\.git/' elseif rev =~# '^\.git/'
let f = substitute(rev, '^\.git', '', '') let f = strpart(rev, 5)
let cdir = fugitive#CommonDir(dir) let fdir = dir . '/'
if f =~# '^/\.\./\.\.\%(/\|$\)' let cdir = fugitive#CommonDir(dir) . '/'
let f = simplify(len(tree) ? tree . f[3:-1] : dir . f) if f =~# '^\.\./\.\.\%(/\|$\)'
elseif f =~# '^/\.\.\%(/\|$\)' let f = simplify(len(tree) ? tree . f[2:-1] : fdir . f)
let f = base . f[3:-1] elseif f =~# '^\.\.\%(/\|$\)'
elseif cdir !=# dir && ( let f = base . f[2:-1]
\ f =~# '^/\%(config\|hooks\|info\|logs/refs\|objects\|refs\|worktrees\)\%(/\|$\)' || elseif cdir !=# fdir && (
\ f !~# '^/\%(index$\|index\.lock$\|\w*MSG$\|\w*HEAD$\|logs/\w*HEAD$\|logs$\|rebase-\w\+\)\%(/\|$\)' && \ f =~# '^\%(config\|hooks\|info\|logs/refs\|objects\|refs\|worktrees\)\%(/\|$\)' ||
\ getftime(FugitiveVimPath(dir . f)) < 0 && getftime(FugitiveVimPath(cdir . f)) >= 0) \ f !~# '^\%(index$\|index\.lock$\|\w*MSG$\|\w*HEAD$\|logs/\w*HEAD$\|logs$\|rebase-\w\+\)\%(/\|$\)' &&
\ getftime(FugitiveVimPath(fdir . f)) < 0 && getftime(FugitiveVimPath(cdir . f)) >= 0)
let f = simplify(cdir . f) let f = simplify(cdir . f)
else else
let f = simplify(dir . f) let f = simplify(fdir . f)
endif endif
elseif rev ==# ':/' elseif rev ==# ':/'
let f = tree let f = tree
@@ -1146,10 +1147,9 @@ function! fugitive#Find(object, ...) abort
elseif rev =~# '^:[0-3]:' elseif rev =~# '^:[0-3]:'
let f = 'fugitive://' . dir . '//' . rev[1] . '/' . rev[3:-1] let f = 'fugitive://' . dir . '//' . rev[1] . '/' . rev[3:-1]
elseif rev ==# ':' elseif rev ==# ':'
if $GIT_INDEX_FILE =~# '/[^/]*index[^/]*\.lock$' && s:cpath(fnamemodify($GIT_INDEX_FILE,':p')[0:strlen(dir)]) ==# s:cpath(dir . '/') && filereadable($GIT_INDEX_FILE) let f = FugitiveFind('.git/index', dir)
if $GIT_INDEX_FILE =~# '/[^/]*index[^/]*\.lock$' && s:cpath(fnamemodify($GIT_INDEX_FILE,':p')[0:strlen(f)-6], s:cpath(f[0 : -6])) && filereadable($GIT_INDEX_FILE)
let f = fnamemodify($GIT_INDEX_FILE, ':p') let f = fnamemodify($GIT_INDEX_FILE, ':p')
else
let f = fugitive#Find('.git/index', dir)
endif endif
elseif rev =~# '^:(\%(top\|top,literal\|literal,top\|literal\))' elseif rev =~# '^:(\%(top\|top,literal\|literal,top\|literal\))'
let f = matchstr(rev, ')\zs.*') let f = matchstr(rev, ')\zs.*')
@@ -1714,12 +1714,13 @@ function! fugitive#CompletePath(base, ...) abort
let stripped = matchstr(a:base, '^\%(:(literal)\|:\)') let stripped = matchstr(a:base, '^\%(:(literal)\|:\)')
let base = strpart(a:base, len(stripped)) let base = strpart(a:base, len(stripped))
endif endif
if base =~# '^\.git/' if base =~# '^\.git/' && len(dir)
let pattern = s:gsub(base[5:-1], '/', '*&').'*' let pattern = s:gsub(base[5:-1], '/', '*&').'*'
let matches = s:GlobComplete(dir . '/', pattern) let fdir = fugitive#Find(dir . '/')
let cdir = fugitive#CommonDir(dir) let matches = s:GlobComplete(fdir, pattern)
if len(cdir) && s:cpath(dir) !=# s:cpath(cdir) let cdir = fugitive#Find('.git/refs', dir)[0 : -5]
call extend(matches, s:GlobComplete(cdir . '/', pattern)) if len(cdir) && s:cpath(fdir) !=# s:cpath(cdir)
call extend(matches, s:GlobComplete(cdir, pattern))
endif endif
call s:Uniq(matches) call s:Uniq(matches)
call map(matches, "'.git/' . v:val") call map(matches, "'.git/' . v:val")
@@ -1761,7 +1762,8 @@ function! fugitive#CompleteObject(base, ...) abort
if a:base =~# '^\.\=/\|^:(' || a:base !~# ':' if a:base =~# '^\.\=/\|^:(' || a:base !~# ':'
let results = [] let results = []
if a:base =~# '^refs/' if a:base =~# '^refs/'
let results += map(s:GlobComplete(fugitive#CommonDir(dir) . '/', a:base . '*'), 's:Slash(v:val)') let cdir = fugitive#Find('.git/refs', dir)[0 : -5]
let results += map(s:GlobComplete(cdir, a:base . '*'), 's:Slash(v:val)')
call map(results, 's:fnameescape(v:val)') call map(results, 's:fnameescape(v:val)')
elseif a:base !~# '^\.\=/\|^:(' elseif a:base !~# '^\.\=/\|^:('
let heads = s:CompleteHeads(dir) let heads = s:CompleteHeads(dir)
@@ -6263,9 +6265,9 @@ function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, args) abo
endif endif
endif endif
endif endif
let cdir = FugitiveVimPath(fugitive#CommonDir(dir)) let refdir = fugitive#Find('.git/refs', dir)
for subdir in ['tags/', 'heads/', 'remotes/'] for subdir in ['tags/', 'heads/', 'remotes/']
if expanded !~# '^[./]' && filereadable(cdir . '/refs/' . subdir . expanded) if expanded !~# '^[./]' && filereadable(refdir . '/' . subdir . expanded)
let expanded = '.git/refs/' . subdir . expanded let expanded = '.git/refs/' . subdir . expanded
endif endif
endfor endfor
@@ -6301,8 +6303,9 @@ function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, args) abo
if type ==# 'tree' && !empty(path) if type ==# 'tree' && !empty(path)
let path = s:sub(path, '/\=$', '/') let path = s:sub(path, '/\=$', '/')
endif endif
if path =~# '^\.git/.*HEAD$' && filereadable(dir . '/' . path[5:-1]) let actual_dir = fugitive#Find('.git/', dir)
let body = readfile(dir . '/' . path[5:-1])[0] if path =~# '^\.git/.*HEAD$' && filereadable(actual_dir . path[5:-1])
let body = readfile(actual_dir . path[5:-1])[0]
if body =~# '^\x\{40,\}$' if body =~# '^\x\{40,\}$'
let commit = body let commit = body
let type = 'commit' let type = 'commit'
@@ -6389,7 +6392,7 @@ function! fugitive#BrowseCommand(line1, count, range, bang, mods, arg, args) abo
endif endif
let i = 0 let i = 0
while commit =~# '^ref: ' && i < 10 while commit =~# '^ref: ' && i < 10
let ref_file = cdir . '/' . commit[5:-1] let ref_file = refdir[0 : -5] . commit[5:-1]
if getfsize(ref_file) > 0 if getfsize(ref_file) > 0
let commit = readfile(ref_file, '', 1)[0] let commit = readfile(ref_file, '', 1)[0]
else else

2
plugin/fugitive.vim
View File

@@ -176,7 +176,7 @@ function! FugitiveCommonDir(...) abort
if empty(dir) if empty(dir)
return '' return ''
endif endif
return fugitive#CommonDir(dir) return fugitive#Find('.git/refs/..', dir)
endfunction endfunction
function! FugitiveWorkTree(...) abort function! FugitiveWorkTree(...) abort