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

diff --git a/setup.sh b/setup.sh
index e2e1edd..6647014 100755
--- a/setup.sh
+++ b/setup.sh
@@ -22,18 +22,22 @@ set -e
 
 . ../lib.sh
 
+
 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 m4 gitconfig \
-        -DGITIGNORE=`pwd`/gitignore \
-        -DPATIENCE="$PATIENCE" \
-        -DOS=`os` \
-        -DTIG="`pwd`/tig.pl"
     link gitconfig ~/.gitconfig
 fi
 
@@ -42,9 +46,6 @@ if installed tig; then
 fi
 
 if installed hg; then
-    generate m4 hgrc \
-        -DHGIGNORE=`pwd`/hgignore \
-        -DOS=`os`
     link hgrc ~/.hgrc
 fi