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

Don't discard deleted submodules

Browse Source 
There isn't a good command to use for the undo.

References https://github.com/tpope/vim-fugitive/issues/1705
This commit is contained in:
Tim Pope
2021-04-01 19:44:02 -04:00
parent c028ea5a44
commit 1d91517cdb
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
autoload/fugitive.vim
View File

@@ -3926,13 +3926,13 @@ function! s:StageDelete(lnum1, lnum2, count) abort
continue continue
endif endif
let sub = get(get(get(b:fugitive_files, info.section, {}), info.filename, {}), 'submodule') let sub = get(get(get(b:fugitive_files, info.section, {}), info.filename, {}), 'submodule')
if info.status ==# 'D' if sub =~# '^S' && info.status ==# 'M'
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] . ' --' let undo = 'Git checkout ' . fugitive#RevParse('HEAD', FugitiveExtractGitDir(info.paths[0]))[0:10] . ' --'
elseif sub =~# '^S'
let err .= '|echoerr ' . string('fugitive: will not touch submodule ' . string(info.relative[0]))
break
elseif info.status ==# 'D'
let undo = 'GRemove'
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