From 95ec5924a6c2597f1b1a15aa9d6afcfe18bee222 Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Fri, 19 Sep 2014 11:42:44 +0200
Subject: [PATCH] gitconfig: use diff.algorithm instead of --patience

---
 gitconfig.in | 15 +++++++++------
 setup.sh     |  6 +-----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/gitconfig.in b/gitconfig.in
index 0f2d4d0..448000a 100644
--- 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 3064ade..c2b3bb9 100755
--- 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}" \
-- 
2.43.2