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

Ensure nested calls do not overwrite value of original shell.

Browse Source 
See #379.
This commit is contained in:
Andy Stewart
2016-10-19 10:00:11 +01:00
parent b1734a3916
commit a693c0d326
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
autoload/gitgutter/utility.vim
View File

@@ -190,6 +190,7 @@ endfunction
function! gitgutter#utility#use_known_shell() abort function! gitgutter#utility#use_known_shell() abort
if has('unix') if has('unix')
if &shell !=# 'sh'
let s:shell = &shell let s:shell = &shell
let s:shellcmdflag = &shellcmdflag let s:shellcmdflag = &shellcmdflag
let s:shellredir = &shellredir let s:shellredir = &shellredir
@@ -197,6 +198,7 @@ function! gitgutter#utility#use_known_shell() abort
set shellcmdflag=-c set shellcmdflag=-c
set shellredir=>%s\ 2>&1 set shellredir=>%s\ 2>&1
endif endif
endif
endfunction endfunction
function! gitgutter#utility#restore_shell() abort function! gitgutter#utility#restore_shell() abort

6
test/testHunkStage.vim
View File

@@ -1,7 +1,13 @@
source helper.vim source helper.vim
call Setup() call Setup()
set shell=foo
normal 5Gi* normal 5Gi*
execute 'GitGutterStageHunk' execute 'GitGutterStageHunk'
call assert_equal('foo', &shell) " NOTE: current test runner ignores v:errors so this line has no effect
set shell=/bin/bash
call DumpSigns('hunkStageSigns') call DumpSigns('hunkStageSigns')
call DumpGitDiffStaged('hunkStageGitDiff') call DumpGitDiffStaged('hunkStageGitDiff')

5
test/testHunkUndo.vim
View File

@@ -1,7 +1,12 @@
source helper.vim source helper.vim
call Setup() call Setup()
set shell=foo
normal 5Gi* normal 5Gi*
execute 'GitGutterUndoHunk' execute 'GitGutterUndoHunk'
call assert_equal('foo', &shell) " NOTE: current test runner ignores v:errors so this line has no effect
set shell=/bin/bash
call DumpSigns('hunkUndoSigns') call DumpSigns('hunkUndoSigns')
call DumpGitDiffStaged('hunkUndoGitDiff') call DumpGitDiffStaged('hunkUndoGitDiff')