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

Extract helper to initialize b:git_dir

Browse Source
This commit is contained in:
Tim Pope
2022-06-07 05:19:14 -04:00
parent 118e9de937
commit 1d6e601298
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
autoload/fugitive.vim
View File

@@ -507,6 +507,10 @@ function! s:GitDir(...) abort
return a:0 ? FugitiveGitDir(a:1) : FugitiveGitDir() return a:0 ? FugitiveGitDir(a:1) : FugitiveGitDir()
endfunction endfunction
function! s:InitializeBuffer(repo) abort
let b:git_dir = s:GitDir(a:repo)
endfunction
function! s:SameRepo(one, two) abort function! s:SameRepo(one, two) abort
let one = s:GitDir(a:one) let one = s:GitDir(a:one)
return !empty(one) && one ==# s:GitDir(a:two) return !empty(one) && one ==# s:GitDir(a:two)
@@ -3032,7 +3036,7 @@ function! fugitive#BufReadCmd(...) abort
if empty(dir) if empty(dir)
return 'echo "Invalid Fugitive URL"' return 'echo "Invalid Fugitive URL"'
endif endif
let b:git_dir = s:GitDir(dir) call s:InitializeBuffer(dir)
if rev ==# ':' if rev ==# ':'
return fugitive#BufReadStatus(v:cmdbang) return fugitive#BufReadStatus(v:cmdbang)
elseif rev =~# '^:\d$' elseif rev =~# '^:\d$'
@@ -3229,7 +3233,7 @@ function! s:TempReadPre(file) abort
endif endif
setlocal buftype=nowrite setlocal buftype=nowrite
setlocal nomodifiable setlocal nomodifiable
let b:git_dir = dict.git_dir call s:InitializeBuffer(dict)
if len(dict.git_dir) if len(dict.git_dir)
call extend(b:, {'fugitive_type': 'temp'}, 'keep') call extend(b:, {'fugitive_type': 'temp'}, 'keep')
endif endif
@@ -3751,7 +3755,7 @@ function! fugitive#Command(line1, line2, range, bang, mods, arg, ...) abort
\ s:HasOpt(args, ['add', 'clean', 'stage'], '-i', '--interactive')) && pager is# 0 \ s:HasOpt(args, ['add', 'clean', 'stage'], '-i', '--interactive')) && pager is# 0
if wants_terminal if wants_terminal
let mods = substitute(s:Mods(a:mods), '\<tab\>', '-tab', 'g') let mods = substitute(s:Mods(a:mods), '\<tab\>', '-tab', 'g')
let assign = len(dir) ? '|let b:git_dir = ' . string(options.git_dir) : '' let assign = len(dir) ? "|call FugitiveDetect({'git_dir':" . string(options.git_dir) . '})' : ''
let argv = s:UserCommandList(options) + args let argv = s:UserCommandList(options) + args
let term_opts = len(env) ? {'env': env} : {} let term_opts = len(env) ? {'env': env} : {}
if has('nvim') if has('nvim')