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

Move :Gmerge warning to top level function

Browse Source 
The old location isn't long for this world.
This commit is contained in:
Tim Pope
2020-01-14 22:39:53 -05:00
parent 305337a9c1
commit a65db6fcf8
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
autoload/fugitive.vim
View File

@@ -3677,14 +3677,7 @@ function! s:MergeRebase(cmd, bang, mods, args, ...) abort
\ . "%+EXUNG \u0110\u1ed8T %.%#," \ . "%+EXUNG \u0110\u1ed8T %.%#,"
\ . "%+E\u51b2\u7a81 %.%#," \ . "%+E\u51b2\u7a81 %.%#,"
\ . 'U%\t%f' \ . 'U%\t%f'
if a:cmd =~# '^merge' && empty(args) && let cmd = s:UserCommand(dir, argv)
\ (had_merge_msg || isdirectory(fugitive#Find('.git/rebase-apply', dir)) ||
\ !empty(s:TreeChomp(dir, 'diff-files', '--diff-filter=U')))
return 'echohl WarningMsg|echo ":Git merge for loading conflicts is deprecated in favor of :Git mergetool"|echohl NONE|silent Git' . (a:bang ? '!' : '') . ' mergetool'
let cmd = g:fugitive_git_executable.' diff-files --name-status --diff-filter=U'
else
let cmd = s:UserCommand(dir, argv)
endif
if !empty($GIT_SEQUENCE_EDITOR) || has('win32') if !empty($GIT_SEQUENCE_EDITOR) || has('win32')
let old_sequence_editor = $GIT_SEQUENCE_EDITOR let old_sequence_editor = $GIT_SEQUENCE_EDITOR
let $GIT_SEQUENCE_EDITOR = 'true' let $GIT_SEQUENCE_EDITOR = 'true'
@@ -3774,6 +3767,13 @@ function! s:RebaseClean(file) abort
endfunction endfunction
function! s:MergeSubcommand(line1, line2, range, bang, mods, args) abort function! s:MergeSubcommand(line1, line2, range, bang, mods, args) abort
let dir = s:Dir()
if empty(args) && (
\ filereadable(fugitive#Find('.git/MERGE_MSG', dir)) ||
\ isdirectory(fugitive#Find('.git/rebase-apply', dir)) ||
\ !empty(s:TreeChomp(dir, 'diff-files', '--diff-filter=U')))
return 'echohl WarningMsg|echo ":Git merge for loading conflicts is deprecated in favor of :Git mergetool"|echohl NONE|silent Git' . (a:bang ? '!' : '') . ' mergetool'
endif
return s:MergeRebase('merge', a:bang, a:mods, a:args) return s:MergeRebase('merge', a:bang, a:mods, a:args)
endfunction endfunction