X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=2afcaeaf91e0a292e07939641ee9effbba1f96d0;hb=ccfa4fe2a1c6e75a3e467aa2f03ea720b16c8fe8;hp=703f27d29ece80f6ce8e3e79d06fdffaac9eaad2;hpb=74faba281912afa6f30f1bf8df6999dd16f911c8;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index 703f27d..2afcaea 100755
--- a/setup.sh
+++ b/setup.sh
@@ -24,16 +24,24 @@ 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
+    if printf '%s' "$LD_PRELOAD" | grep libcoloredstderr.so >/dev/null; then
+        echo 'gitconfig: removing stderr fix'
+        sed_i '/^\t\(fs\|fg\)  =/ s/2>&1//' gitconfig
     fi
 
-    generate gitconfig .m4 m4 \
-        -DPATIENCE="$PATIENCE" \
-        -DOS=`os` \
-        -DPWD="`pwd`"
     link gitconfig ~/.gitconfig
 fi