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

Restore X on submodules

Browse Source 
References https://github.com/tpope/vim-fugitive/issues/1705
This commit is contained in:
Tim Pope
2021-03-29 20:31:50 -04:00
parent 09cbabe793
commit 6b39f6c641
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
autoload/fugitive.vim
View File

@@ -3813,8 +3813,14 @@ function! s:StageDelete(lnum1, lnum2, count) abort
if empty(info.paths) if empty(info.paths)
continue continue
endif endif
let sub = get(get(get(b:fugitive_files, info.section, {}), info.filename, {}), 'submodule')
if info.status ==# 'D' if info.status ==# 'D'
let undo = 'GRemove' let undo = 'GRemove'
elseif sub =~# '^S' && info.status !~# '[MD]'
let err .= '|echoerr ' . string('fugitive: will not delete submodule ' . string(info.relative[0]))
break
elseif sub =~# '^S'
let undo = 'Git checkout ' . fugitive#RevParse('HEAD', FugitiveExtractGitDir(info.paths[0]))[0:10] . ' --'
elseif info.paths[0] =~# '/$' elseif info.paths[0] =~# '/$'
let err .= '|echoerr ' . string('fugitive: will not delete directory ' . string(info.relative[0])) let err .= '|echoerr ' . string('fugitive: will not delete directory ' . string(info.relative[0]))
break break
@@ -3823,6 +3829,11 @@ function! s:StageDelete(lnum1, lnum2, count) abort
endif endif
if info.patch if info.patch
call s:StageApply(info, 1, info.section ==# 'Staged' ? ['--index'] : []) call s:StageApply(info, 1, info.section ==# 'Staged' ? ['--index'] : [])
elseif sub =~# '^S'
if info.section ==# 'Staged'
call s:TreeChomp('reset', '--', info.paths[0])
endif
call s:TreeChomp('submodule', 'update', '--', info.paths[0])
elseif info.status ==# '?' elseif info.status ==# '?'
call s:TreeChomp('clean', '-f', '--', info.paths[0]) call s:TreeChomp('clean', '-f', '--', info.paths[0])
elseif a:count == 2 elseif a:count == 2