X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=588e81acb408640bd51074d94c1be204825229a9;hb=ef0b7066f4123c815ca67e74218613803c48506a;hp=ff01b10bb234e5a2ece104847549010add812f91;hpb=c3582889fd9132a91a74d483dd165ed65bad47c5;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index ff01b10..588e81a 100755
--- a/setup.sh
+++ b/setup.sh
@@ -27,10 +27,30 @@ 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
+    # Even older Git versions don't support color.function.
+    if ! git status >/dev/null 2>&1; then
+        echo 'gitconfig: removing color.function'
+        sed_i 's/^[[:space:]]*function = .*//' gitconfig
+    fi
     # Older Git versions don't support --patience.
     if ! git diff --patience >/dev/null 2>&1; then
+        echo 'gitconfig: removing --patience'
         sed_i 's/--patience//' gitconfig
     fi
+    # Even older Git versions don't support git log --patch but only -p.
+    if ! git log --patch >/dev/null 2>&1; then
+        echo 'gitconfig: replacing git log --patch with -p'
+        sed_i 's/log --patch/log -p/' 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
 
     link gitconfig ~/.gitconfig
 fi