gitconfig: use diff.algorithm instead of --patience

diff --git a/gitconfig.in b/gitconfig.in
index 0f2d4d0fcc11df4ed849626668cd2d770035f929..448000a3c431d301284206599c39b2ab2727c050 100644 (file)
--- a/gitconfig.in
+++ b/gitconfig.in
@@ -61,16 +61,16 @@
        c   = commit --verbose
        ca  = commit --verbose --amend
        cad = commit --verbose --amend --date=
-       d   = diff --patience
-       dw  = diff --patience --color-words
-       dc  = diff --patience --cached
-       dcw = diff --patience --cached --color-words
+       d   = diff
+       dw  = diff --color-words
+       dc  = diff --cached
+       dcw = diff --cached --color-words
        ds  = diff --stat
        s   = status
        l   = log
        ls  = log --stat
-       lp  = log --patch --patience
-       lpw = log --patch --patience --color-words
+       lp  = log --patch
+       lpw = log --patch --color-words
        a   = add
        ap  = add --patch
        au  = add --update
@@ -149,6 +149,9 @@
        # Detect copies and renames.
        renames = copy
 
+       # Diff algorithm to use.
+       algorithm = patience
+
        # Change the definition of a word as used by diff --color-words to be
        # shorter (not only spaces) and thus simplify the generated diffs.
        # Words ([a-zA-Z0-9_]+) are matched, or a single non-word character

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}" \