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

Call Gcommit on Grebase --continue

Browse Source 
On a rebase instruction that should result in an immediate commit,
the quickfix list will be closed and Gcommit will be called.
This commit is contained in:
rbong
2018-12-26 08:39:34 -05:00
committed by Tim Pope
parent 0850600021
commit ae8fed6dd3
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
autoload/fugitive.vim
View File

@@ -2293,6 +2293,13 @@ function! s:RemoteComplete(A, L, P) abort
return join(matches, "\n")
endfunction
function! s:HasRebaseCommitCmd() abort
if !filereadable(b:git_dir . '/rebase-merge/amend') || !filereadable(b:git_dir . '/rebase-merge/done')
return 0
endif
return get(readfile(b:git_dir . '/rebase-merge/done'), -1, '') =~# '^[^e]'
endfunction
function! fugitive#Cwindow() abort
if &buftype == 'quickfix'
cwindow
@@ -2330,6 +2337,7 @@ function! s:Merge(cmd, bang, mods, args) abort
\ . '%+ECannot %.%#: Your index contains uncommitted changes.,'
\ . '%+EThere is no tracking information for the current branch.,'
\ . '%+EYou are not currently on a branch. Please specify which,'
\ . '%+I%.%#git rebase --continue,'
\ . 'CONFLICT (%m): %f deleted in %.%#,'
\ . 'CONFLICT (%m): Merge conflict in %f,'
\ . 'CONFLICT (%m): Rename \"%f\"->%.%#,'
@@ -2368,10 +2376,13 @@ function! s:Merge(cmd, bang, mods, args) abort
execute cdback
endtry
call fugitive#ReloadStatus()
if empty(filter(getqflist(),'v:val.valid'))
if empty(filter(getqflist(),'v:val.valid && v:val.type !=# "I"'))
if !had_merge_msg && filereadable(b:git_dir . '/MERGE_MSG')
cclose
return mods . 'Gcommit --no-status -n -t '.s:shellesc(b:git_dir . '/MERGE_MSG')
elseif a:cmd =~# '^rebase' && ' '.a:args =~# ' --continue' && s:HasRebaseCommitCmd()
cclose
return mods . 'Gcommit --amend'
endif
endif
let qflist = getqflist()