X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=bf22f99166748ec23867772fd76e5f1d145c67c0;hb=b179b88b9659eda769a4aaec76f9b270ee41c000;hp=3064adec21b6765a46567c7c93abb6dd83beaf5d;hpb=1aa17ff0f406fc37d4c84fe432142148fef10ac7;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index 3064ade..bf22f99 100755
--- a/setup.sh
+++ b/setup.sh
@@ -24,8 +24,7 @@ set -eu
 
 
 if installed git; then
-    generate gitconfig .in simple_cpp \
-        PWD -- "`pwd`"
+    generate gitconfig .in simple_cpp PWD -- "`pwd`"
 
     # Older Git versions don't support push.default = simple.
     if ! git status >/dev/null 2>&1; then
@@ -37,16 +36,12 @@ if installed git; 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 coloredstderr is used to color stderr then remove the workaround for
     # missing output to stderr.
     if test -n "${LD_PRELOAD:+set}" \
@@ -59,7 +54,11 @@ if installed git; then
 fi
 
 if installed tig; then
-    link tigrc ~/.tigrc
+    if tig --version | grep -F 'tig version 1.' >/dev/null; then
+        link tigrc.old ~/.tigrc
+    else
+        link tigrc ~/.tigrc
+    fi
 fi
 
 if installed hg; then