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

Decouple s:DirCheck() from s:VersionCheck()

Browse Source
This commit is contained in:
Tim Pope
2023-09-17 18:57:55 -04:00
parent 2e6cf7287c
commit 7e72fb9cde
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
autoload/fugitive.vim
View File

@@ -122,10 +122,6 @@ endfunction
let s:worktree_error = "core.worktree is required when using an external Git dir" let s:worktree_error = "core.worktree is required when using an external Git dir"
function! s:DirCheck(...) abort function! s:DirCheck(...) abort
let vcheck = s:VersionCheck()
if !empty(vcheck)
return vcheck
endif
let dir = call('FugitiveGitDir', a:000) let dir = call('FugitiveGitDir', a:000)
if !empty(dir) && FugitiveWorkTree(dir, 1) is# 0 if !empty(dir) && FugitiveWorkTree(dir, 1) is# 0
return 'return ' . string('echoerr "fugitive: ' . s:worktree_error . '"') return 'return ' . string('echoerr "fugitive: ' . s:worktree_error . '"')
@@ -4125,6 +4121,7 @@ function! fugitive#CdComplete(A, L, P) abort
endfunction endfunction
function! fugitive#Cd(path, ...) abort function! fugitive#Cd(path, ...) abort
exe s:VersionCheck()
let path = substitute(a:path, '^:/:\=\|^:(\%(top\|top,literal\|literal,top\|literal\))', '', '') let path = substitute(a:path, '^:/:\=\|^:(\%(top\|top,literal\|literal,top\|literal\))', '', '')
if path !~# '^/\|^\a\+:\|^\.\.\=\%(/\|$\)' if path !~# '^/\|^\a\+:\|^\.\.\=\%(/\|$\)'
let dir = s:Dir() let dir = s:Dir()
@@ -5962,6 +5959,7 @@ function! s:LogParse(state, dir, prefix, line) abort
endfunction endfunction
function! fugitive#LogCommand(line1, count, range, bang, mods, args, type) abort function! fugitive#LogCommand(line1, count, range, bang, mods, args, type) abort
exe s:VersionCheck()
let dir = s:Dir() let dir = s:Dir()
exe s:DirCheck(dir) exe s:DirCheck(dir)
let listnr = a:type =~# '^l' ? 0 : -1 let listnr = a:type =~# '^l' ? 0 : -1
@@ -6665,6 +6663,7 @@ endfunction
" Section: :GMove, :GRemove " Section: :GMove, :GRemove
function! s:Move(force, rename, destination) abort function! s:Move(force, rename, destination) abort
exe s:VersionCheck()
let dir = s:Dir() let dir = s:Dir()
exe s:DirCheck(dir) exe s:DirCheck(dir)
if s:DirCommitFile(@%)[1] !~# '^0\=$' || empty(@%) if s:DirCommitFile(@%)[1] !~# '^0\=$' || empty(@%)
@@ -6738,6 +6737,7 @@ function! fugitive#RenameCommand(line1, line2, range, bang, mods, arg, ...) abor
endfunction endfunction
function! s:Remove(after, force) abort function! s:Remove(after, force) abort
exe s:VersionCheck()
let dir = s:Dir() let dir = s:Dir()
exe s:DirCheck(dir) exe s:DirCheck(dir)
if len(@%) && s:DirCommitFile(@%)[1] ==# '' if len(@%) && s:DirCommitFile(@%)[1] ==# ''