X-Git-Url: https://ruderich.org/simon/gitweb/?p=config%2Fdotfiles.git;a=blobdiff_plain;f=vcs%2Fsetup.sh;h=a0e475d2a120d3671fc5e480404e36eb0b5103da;hp=664f938058b015881113d25f75b84854a7895be0;hb=9e4b2aff9242c3e72c714c3bf01c670b576e6627;hpb=f2c6086838bcdf795c3322c27d78a6bfc49c9d4b

diff --git a/vcs/setup.sh b/vcs/setup.sh
index 664f938..a0e475d 100755
--- a/vcs/setup.sh
+++ b/vcs/setup.sh
@@ -26,21 +26,24 @@ set -eu
 if installed git; then
     generate gitconfig .in simple_cpp PWD -- "`pwd`"
 
-    # Older Git versions don't support push.default = simple.
+    # Support for old gits.
     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
-    # 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 git stash push -- doesnt-exist 2>&1 \
+            | grep 'usage: git stash list' > /dev/null; then
+        echo 'gitconfig: replacing "stash push" with "stash save"'
+        sed_i 's/stash push/stash save/g' gitconfig
+    fi
 
     # If coloredstderr is used to color stderr then remove the workaround for
     # missing output to stderr.
@@ -54,6 +57,11 @@ if installed git; then
 fi
 
 if installed tig; then
+    generate tigrc .in cat
+    if tig --version | grep '^tig version 2\.[012]' >/dev/null; then
+        echo 'tigrc: removing history options'
+        grep_i -v '^set history-size = ' tigrc
+    fi
     link tigrc ~/.tigrc
 fi