From b029ee83b00588cd35c318a6a44cd350bb952190 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Sun, 5 Jan 2014 23:52:42 +0100 Subject: [PATCH] setup.sh: Support even older Git versions. Works fine with 1.6.1. --- setup.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/setup.sh b/setup.sh index 2afcaea..588e81a 100755 --- 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 -- 2.43.2