setup.sh,gitconfig: Simplify fallback solution for --patience.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index 703f27d29ece80f6ce8e3e79d06fdffaac9eaad2..ff01b10bb234e5a2ece104847549010add812f91 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -24,16 +24,14 @@ set -e
 
 
 if installed git; then
+    generate gitconfig .in simple_cpp \
+        PWD -- "`pwd`"
+
     # Older Git versions don't support --patience.
-    PATIENCE=
-    if git diff --patience >/dev/null 2>&1; then
-        PATIENCE=--patience
+    if ! git diff --patience >/dev/null 2>&1; then
+        sed_i 's/--patience//' gitconfig
     fi
 
-    generate gitconfig .m4 m4 \
-        -DPATIENCE="$PATIENCE" \
-        -DOS=`os` \
-        -DPWD="`pwd`"
     link gitconfig ~/.gitconfig
 fi