ld/amix-vimrc-mirror
1
0
Fork 0
mirror of https://github.com/amix/vimrc synced 2025-07-27 06:55:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/upstream/master'

Browse Source 
Conflicts:
	sources_non_forked/ale/autoload/ale.vim
	sources_non_forked/lightline.vim/doc/lightline.txt
	sources_non_forked/nerdtree/.github/PULL_REQUEST_TEMPLATE.md
	sources_non_forked/nerdtree/autoload/nerdtree.vim
	sources_non_forked/nerdtree/plugin/NERD_tree.vim
	sources_non_forked/vim-fugitive/autoload/fugitive.vim
	sources_non_forked/vim-fugitive/doc/fugitive.txt
This commit is contained in:
geezuslucifer@gmail.com
2021-02-19 08:50:18 -06:00
parent f2c3cff101 f6855c3c41
commit 43c7efba8d
352 changed files with 11973 additions and 4879 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sources_non_forked/vim-gitgutter/autoload/gitgutter.vim
View File

@ -1,5 +1,3 @@
let s:t_string = type('')
" Primary functions {{{
function! gitgutter#all(force) abort
@ -42,7 +40,7 @@ function! gitgutter#process_buffer(bufnr, force) abort
if a:force || s:has_fresh_changes(a:bufnr)
let diff = ''
let diff = 'NOT SET'
try
let diff = gitgutter#diff#run_diff(a:bufnr, g:gitgutter_diff_relative_to, 0)
catch /gitgutter not tracked/
@ -52,7 +50,7 @@ function! gitgutter#process_buffer(bufnr, force) abort
call gitgutter#hunk#reset(a:bufnr)
endtry
if diff != 'async'
if diff != 'async' && diff != 'NOT SET'
call gitgutter#diff#handler(a:bufnr, diff)
endif
@ -174,11 +172,7 @@ function! gitgutter#setup_maps()
endfunction
function! s:setup_path(bufnr, continuation)
let p = gitgutter#utility#repo_path(a:bufnr, 0)
if type(p) == s:t_string && !empty(p) " if path is known
return
endif
if gitgutter#utility#has_repo_path(a:bufnr) | return | endif
<<<<<<< HEAD
call gitgutter#utility#setbufvar(a:bufnr, 'mapped', 1)
@ -219,9 +213,17 @@ endfunction
" - it ignores unsaved changes in buffers
" - it does not change to the repo root
function! gitgutter#quickfix()
let cmd = g:gitgutter_git_executable.' '.g:gitgutter_git_args.' rev-parse --show-cdup'
let path_to_repo = get(systemlist(cmd), 0, '')
if !empty(path_to_repo) && path_to_repo[-1:] != '/'
let path_to_repo .= '/'
endif
let locations = []
let cmd = g:gitgutter_git_executable.' '.g:gitgutter_git_args.' --no-pager '.g:gitgutter_git_args.
\ ' diff --no-ext-diff --no-color -U0 '.g:gitgutter_diff_args
let cmd = g:gitgutter_git_executable.' '.g:gitgutter_git_args.' --no-pager'.
\ ' diff --no-ext-diff --no-color -U0'.
\ ' --src-prefix=a/'.path_to_repo.' --dst-prefix=b/'.path_to_repo.' '.
\ g:gitgutter_diff_args. ' '. g:gitgutter_diff_base
let diff = systemlist(cmd)
let lnum = 0
for line in diff