From 3d252dac21f2937d79b3c7d37c1ce38bdd6c2d82 Mon Sep 17 00:00:00 2001
From: Tim Pope <code@tpope.net>
Date: Sun, 30 Jun 2019 21:37:17 -0400
Subject: [PATCH] Avoid use of :! in :Gcommit

References https://github.com/tpope/vim-fugitive/issues/435
---
 autoload/fugitive.vim | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
index 7bff4fe..39725c6 100644
--- a/autoload/fugitive.vim
+++ b/autoload/fugitive.vim
@@ -2672,7 +2672,6 @@ function! s:CommitCommand(line1, line2, range, count, bang, mods, reg, arg, args
   let tree = s:Tree(dir)
   let msgfile = fugitive#Find('.git/COMMIT_EDITMSG', dir)
   let outfile = tempname()
-  let errorfile = tempname()
   try
     let guioptions = &guioptions
     try
@@ -2687,12 +2686,13 @@ function! s:CommitCommand(line1, line2, range, count, bang, mods, reg, arg, args
       endif
       let args = s:ShellExpand(a:arg)
       let command .= s:UserCommand() . ' commit ' . args
-      if &shell =~# 'csh'
-        noautocmd silent execute '!('.escape(command, '!#%').' > '.outfile.') >& '.errorfile
-      elseif a:arg =~# '\%(^\| \)-\%(-interactive\|p\|-patch\)\>'
+      if a:arg =~# '\%(^\| \)-\%(-interactive\|p\|-patch\)\>' && &shell !~# 'csh'
+        let errorfile = tempname()
         noautocmd execute '!'.command.' 2> '.errorfile
+        let errors = readfile(errorfile)
+        call delete(errorfile)
       else
-        noautocmd silent execute '!'.command.' > '.outfile.' 2> '.errorfile
+        let errors = split(s:TempCmd(outfile, command), "\n")
       endif
       let error = v:shell_error
     finally
@@ -2711,7 +2711,6 @@ function! s:CommitCommand(line1, line2, range, count, bang, mods, reg, arg, args
       call fugitive#ReloadStatus()
       return ''
     else
-      let errors = readfile(errorfile)
       let error = get(errors,-2,get(errors,-1,'!'))
       if error =~# 'false''\=\.$'
         let args = s:gsub(args,'%(%(^| )-- )@<!%(^| )@<=%(-[esp]|--edit|--interactive|--patch|--signoff)%($| )','')
@@ -2742,7 +2741,6 @@ function! s:CommitCommand(line1, line2, range, count, bang, mods, reg, arg, args
     return 'echoerr ' . string(v:exception)
   finally
     call delete(outfile)
-    call delete(errorfile)
   endtry
 endfunction