From ee0e3d3b8dff464a5917100560d0e51365b9fbc8 Mon Sep 17 00:00:00 2001
From: Victor Volle <victor.volle@beta-thoughts.org>
Date: Sat, 21 Feb 2015 09:40:42 +0100
Subject: [PATCH] do not use git for recursive diff

---
 modules/utility/functions/diff | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/utility/functions/diff b/modules/utility/functions/diff
index 8347899e..f818c848 100644
--- a/modules/utility/functions/diff
+++ b/modules/utility/functions/diff
@@ -10,7 +10,15 @@ function diff {
     if (( $+commands[colordiff] )); then
       command diff --unified "$@" | colordiff --difftype diffu
     elif (( $+commands[git] )); then
-      git --no-pager diff --color=auto --no-ext-diff --no-index "$@"
+      local diffr=0
+      for x; do
+        if [ "$x" = '-r' ]; then diffr=1; fi
+      done
+      if [ $diffr -eq 0 ]; then
+        git --no-pager diff --color=auto --no-ext-diff --no-index "$@"
+      else 
+        command diff --unified "$@"
+      fi
     else
       command diff --unified "$@"
     fi