setup.sh,gitconfig: Simplify fallback solution for --patience.

diff --git a/gitconfig.in b/gitconfig.in
index 14129c59bdd98ee8a506807072a80dbc512f9398..005114a696a050297489e1e081d43c669aaf2501 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 --patience
+       dw  = diff --patience --color-words
+       dc  = diff --patience --cached
+       dcw = diff --patience --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 --patience
+       lpw = log --patch --patience --color-words
        a   = add
        ap  = add --patch
        au  = add --update

diff --git a/setup.sh b/setup.sh
index 06585379f22d3460fc2d227fe736a735f66dd6eb..ff01b10bb234e5a2ece104847549010add812f91 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -24,14 +24,14 @@ set -e
 
 
 if installed git; then
+    generate gitconfig .in simple_cpp \
+        PWD -- "`pwd`"
+
     # Older Git versions don't support --patience.
-    PATIENCE=
-    if git diff --patience >/dev/null 2>&1; then
-        PATIENCE=--patience
+    if ! git diff --patience >/dev/null 2>&1; then
+        sed_i 's/--patience//' gitconfig
     fi
 
-    generate gitconfig .in simple_cpp \
-        PATIENCE PWD -- "$PATIENCE" "`pwd`"
     link gitconfig ~/.gitconfig
 fi