From: Simon Ruderich <simon@ruderich.org>
Date: Thu, 27 Sep 2012 11:01:05 +0000 (+0200)
Subject: Merge remote-tracking branch 'asp/master'
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=3a96a98016c6a80df2686c2061663645092f1808;hp=aed1a4db86c59e2bc5a22eadd5d4a11eab3ab85e;p=config%2Fdotfiles.git

Merge remote-tracking branch 'asp/master'
---

diff --git a/gitconfig.m4 b/gitconfig.m4
index 32bb9cf..e865454 100644
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -56,16 +56,16 @@ include(../lib.m4)
 	# Local.
 	c   = commit --verbose
 	ci  = commit --verbose
-	d   = diff --patience
-	di  = diff --patience
-	dw  = diff --patience --color-words
-	dc  = diff --patience --cached
-	dcw = diff --patience --cached --color-words
+	d   = diff PATIENCE
+	di  = diff PATIENCE
+	dw  = diff PATIENCE --color-words
+	dc  = diff PATIENCE --cached
+	dcw = diff PATIENCE --cached --color-words
 	s   = status
 	st  = status
 	l   = log
 	ls  = log --stat
-	lp  = log --patch --patience
+	lp  = log --patch PATIENCE
 	a   = add
 	ap  = add --patch
 	au  = add --update
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