X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=6647014475f9c690d0ba0d47671fe28e61654359;hb=2dc2008b7e050faa98d389bb7f5879b2e5e6e85b;hp=4b5fc72b8e3b2b05eb1d02c9a9ae90f0f76556d2;hpb=f72da7852fe0e689875030ec2972f3198be91458;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index 4b5fc72..6647014 100755
--- a/setup.sh
+++ b/setup.sh
@@ -24,16 +24,20 @@ set -e
 
 
 if installed git; then
+    generate gitconfig .in simple_cpp \
+        PWD -- "`pwd`"
+
+    # Older Git versions don't support push.default = simple.
+    if ! git status >/dev/null 2>&1; then
+        echo 'gitconfig: removing push.default = simple'
+        grep_i -v '^[[:space:]]default = simple$' gitconfig
+    fi
     # 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
+        echo 'gitconfig: removing --patience'
+        sed_i 's/--patience//' gitconfig
     fi
 
-    generate gitconfig .m4 m4 \
-        -DPATIENCE="$PATIENCE" \
-        -DOS=`os` \
-        -DPWD="`pwd`"
     link gitconfig ~/.gitconfig
 fi
 
@@ -42,8 +46,6 @@ if installed tig; then
 fi
 
 if installed hg; then
-    generate hgrc .m4 m4 \
-        -DOS=`os`
     link hgrc ~/.hgrc
 fi