vcs/gitconfig: support older gits without `stash push`

[config/dotfiles.git] / vcs / setup.sh

diff --git a/vcs/setup.sh b/vcs/setup.sh
index bf22f99166748ec23867772fd76e5f1d145c67c0..3c04f595a54012dc696e50268aa19a2106384e31 100755 (executable)
--- a/vcs/setup.sh
+++ b/vcs/setup.sh
@@ -42,6 +42,12 @@ if installed git; then
         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.
     if test -n "${LD_PRELOAD:+set}" \
@@ -54,11 +60,12 @@ if installed git; then
 fi
 
 if installed tig; then
-    if tig --version | grep -F 'tig version 1.' >/dev/null; then
-        link tigrc.old ~/.tigrc
-    else
-        link tigrc ~/.tigrc
+    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
 
 if installed hg; then