gitconfig: use diff.algorithm instead of --patience

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index 3064adec21b6765a46567c7c93abb6dd83beaf5d..c2b3bb991526a65ae78e7058ef11729cc0a69d46 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -37,16 +37,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}" \