From 0ca15c8ad2b2f5db6a148b2dd18857828ab051bc Mon Sep 17 00:00:00 2001
From: Manuel Johannes Messner <manuel.johannes.messner@hs-furtwangen.de>
Date: Mon, 17 Aug 2015 09:27:51 +0200
Subject: [PATCH] Add support for fish shell

The `&&` and the `||` operators aren't available in fish.
The equivalents are `; and` and `; or`.
Also single parentheses are used for command substitution.
The fish equivalents are `begin` and `end`.
But they aren't needed here.
---
 autoload/gitgutter/diff.vim    | 29 ++++++++++++++++++++---------
 autoload/gitgutter/utility.vim |  3 ++-
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/autoload/gitgutter/diff.vim b/autoload/gitgutter/diff.vim
index 0cbe5de..2006847 100644
--- a/autoload/gitgutter/diff.vim
+++ b/autoload/gitgutter/diff.vim
@@ -11,13 +11,21 @@ let s:hunk_re = '^@@ -\(\d\+\),\?\(\d*\) +\(\d\+\),\?\(\d*\) @@'
 
 
 function! gitgutter#diff#run_diff(realtime, use_external_grep)
-  " Wrap compound commands in parentheses to make Windows happy.
-  let cmd = '('
+  " Detect whether user uses fish shell
+  let l:fish = &shell =~# 'fish'
+
+  if !l:fish
+    " Wrap compound commands in parentheses to make Windows happy.
+    let cmd = '('
+  else
+    let cmd = ''
+  end
 
   let bufnr = gitgutter#utility#bufnr()
   let tracked = getbufvar(bufnr, 'gitgutter_tracked')  " i.e. tracked by git
   if !tracked
-    let cmd .= 'git ls-files --error-unmatch '.gitgutter#utility#shellescape(gitgutter#utility#filename()).' && ('
+    let cmd .= 'git ls-files --error-unmatch '.gitgutter#utility#shellescape(gitgutter#utility#filename())
+    let cmd .= l:fish ? '; and ' : ' && ('
   endif
 
   if a:realtime
@@ -29,7 +37,8 @@ function! gitgutter#diff#run_diff(realtime, use_external_grep)
       let blob_file .= '.'.extension
       let buff_file .= '.'.extension
     endif
-    let cmd .= 'git show '.blob_name.' > '.blob_file.' && '
+    let cmd .= 'git show '.blob_name.' > '.blob_file
+    let cmd .= l:fish ? '; and ' : ' && '
 
     " Writing the whole buffer resets the '[ and '] marks and also the
     " 'modified' flag (if &cpoptions includes '+').  These are unwanted
@@ -61,14 +70,16 @@ function! gitgutter#diff#run_diff(realtime, use_external_grep)
     " differences are found.  However we want to treat non-matches and
     " differences as non-erroneous behaviour; so we OR the command with one
     " which always exits with success (0).
-    let cmd.= ' || exit 0'
+    let cmd.= l:fish ? '; or exit 0' : ' || exit 0'
   endif
 
-  let cmd .= ')'
-
-  if !tracked
+  if !l:fish
     let cmd .= ')'
-  endif
+
+    if !tracked
+      let cmd .= ')'
+    endif
+  end
 
   let diff = gitgutter#utility#system(gitgutter#utility#command_in_directory_of_file(cmd))
 
diff --git a/autoload/gitgutter/utility.vim b/autoload/gitgutter/utility.vim
index 2281448..4fecdd5 100644
--- a/autoload/gitgutter/utility.vim
+++ b/autoload/gitgutter/utility.vim
@@ -131,7 +131,8 @@ function! gitgutter#utility#file_relative_to_repo_root()
 endfunction
 
 function! gitgutter#utility#command_in_directory_of_file(cmd)
-  return 'cd ' . gitgutter#utility#shellescape(gitgutter#utility#directory_of_file()) . ' && ' . a:cmd
+  let l:fish = &shell =~# 'fish'
+  return 'cd ' . gitgutter#utility#shellescape(gitgutter#utility#directory_of_file()) . (l:fish ? '; and ' : ' && ') . a:cmd
 endfunction
 
 function! gitgutter#utility#highlight_name_for_change(text)