X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=0ef9e6af12dcdc7067a3195ef52abd6296a6ba98;hb=2eef5463417d581034bfbacb016114d0a5be3434;hp=bedc5bb214df55792a7f16934fb4df6c0848e969;hpb=6185676752044be8c954377be9a8b982689b181e;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index bedc5bb..0ef9e6a 100755
--- a/setup.sh
+++ b/setup.sh
@@ -21,7 +21,16 @@
 . ../lib.sh
 
 if installed git; then
-    generate m4 gitconfig -DGITIGNORE=`pwd`/gitignore -DOS=`os`
+    # 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
 
@@ -30,7 +39,9 @@ if installed tig; then
 fi
 
 if installed hg; then
-    generate m4 hgrc -DHGIGNORE=`pwd`/hgignore -DOS=`os`
+    generate m4 hgrc \
+        -DHGIGNORE=`pwd`/hgignore \
+        -DOS=`os`
     link hgrc ~/.hgrc
 fi