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

diff --git a/setup.sh b/setup.sh
index bab4ce2..2afcaea 100755
--- a/setup.sh
+++ b/setup.sh
@@ -34,8 +34,13 @@ if installed git; then
     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
+    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