vim/vim-fugitive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Decouple :Gcommit from repo object

Browse Source
This commit is contained in:
Tim Pope 2018-07-19 02:09:51 -04:00
parent fb2289982b
commit 0aa3389f5c
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
autoload/fugitive.vim
View File

@ -1228,10 +1228,11 @@ call s:command("-nargs=? -complete=customlist,s:CommitComplete Gcommit :execute
function! s:Commit(mods, args, ...) abort function! s:Commit(mods, args, ...) abort
let mods = s:gsub(a:mods ==# '<mods>' ? '' : a:mods, '<tab>', '-tab') let mods = s:gsub(a:mods ==# '<mods>' ? '' : a:mods, '<tab>', '-tab')
let repo = a:0 ? a:1 : s:repo() let dir = a:0 ? a:1 : b:git_dir
let tree = FugitiveTreeForGitDir(dir)
let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd' let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd'
let dir = getcwd() let cwd = getcwd()
let msgfile = repo.dir('COMMIT_EDITMSG') let msgfile = dir . '/COMMIT_EDITMSG'
let outfile = tempname() let outfile = tempname()
let errorfile = tempname() let errorfile = tempname()
try try
@ -1240,7 +1241,7 @@ function! s:Commit(mods, args, ...) abort
if &guioptions =~# '!' if &guioptions =~# '!'
setglobal guioptions-=! setglobal guioptions-=!
endif endif
execute cd s:fnameescape(repo.tree()) execute cd s:fnameescape(tree)
if s:winshell() if s:winshell()
let command = '' let command = ''
let old_editor = $GIT_EDITOR let old_editor = $GIT_EDITOR
@ -1258,7 +1259,7 @@ function! s:Commit(mods, args, ...) abort
endif endif
let error = v:shell_error let error = v:shell_error
finally finally
execute cd s:fnameescape(dir) execute cd s:fnameescape(cwd)
let &guioptions = guioptions let &guioptions = guioptions
endtry endtry
if !has('gui_running') if !has('gui_running')
@ -1281,7 +1282,7 @@ function! s:Commit(mods, args, ...) abort
let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd' let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd'
let cwd = getcwd() let cwd = getcwd()
try try
exe cd s:fnameescape(repo.tree()) exe cd s:fnameescape(tree)
let args = s:gsub(args,'\\@<!(\%|##=|#\<=\d+)(:\w)*','\=fnamemodify(FugitivePath(expand(submatch(1))),":." . submatch(2))') let args = s:gsub(args,'\\@<!(\%|##=|#\<=\d+)(:\w)*','\=fnamemodify(FugitivePath(expand(submatch(1))),":." . submatch(2))')
finally finally
exe cd cwd exe cd cwd
@ -1336,7 +1337,7 @@ function! s:FinishCommit() abort
let args = getbufvar(+expand('<abuf>'),'fugitive_commit_arguments') let args = getbufvar(+expand('<abuf>'),'fugitive_commit_arguments')
if !empty(args) if !empty(args)
call setbufvar(+expand('<abuf>'),'fugitive_commit_arguments','') call setbufvar(+expand('<abuf>'),'fugitive_commit_arguments','')
return s:Commit('', args, s:repo(getbufvar(+expand('<abuf>'),'git_dir'))) return s:Commit('', args, getbufvar(+expand('<abuf>'),'git_dir'))
endif endif
return '' return ''
endfunction endfunction