setup.sh,gitconfig: Support old Git without diff --patience.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index d59568ff712b6b7db01e0a1df3c4eb037cc5349b..0ef9e6af12dcdc7067a3195ef52abd6296a6ba98 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -21,8 +21,15 @@
 . ../lib.sh
 
 if installed git; then
+    # Older Git versions don't support --patience.
+    PATIENCE=
+    if git diff --patience >/dev/null 2>&1; then
+        PATIENCE=--patience
+    fi
+
     generate m4 gitconfig \
         -DGITIGNORE=`pwd`/gitignore \
+        -DPATIENCE="$PATIENCE" \
         -DOS=`os`
     link gitconfig ~/.gitconfig
 fi