]> ruderich.org/simon Gitweb - config/dotfiles.git/commitdiff
setup.sh: Support even older Git versions.
authorSimon Ruderich <simon@ruderich.org>
Sun, 5 Jan 2014 22:52:42 +0000 (23:52 +0100)
committerSimon Ruderich <simon@ruderich.org>
Sun, 5 Jan 2014 22:54:04 +0000 (23:54 +0100)
Works fine with 1.6.1.

setup.sh

index 2afcaeaf91e0a292e07939641ee9effbba1f96d0..588e81acb408640bd51074d94c1be204825229a9 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -32,11 +32,21 @@ if installed git; 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
     # 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 printf '%s' "$LD_PRELOAD" | grep libcoloredstderr.so >/dev/null; then
         echo 'gitconfig: removing stderr fix'
         sed_i '/^\t\(fs\|fg\)  =/ s/2>&1//' gitconfig