setup.sh: Display message when removing "--patience".

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index fe584a195a9379ce5027d3b9dcd2226e4a6a0ac3..6647014475f9c690d0ba0d47671fe28e61654359 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -24,15 +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" \
-        -DPWD="`pwd`"
     link gitconfig ~/.gitconfig
 fi