From 428a8eaf62106975d068b8468436434faae47626 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@nil.im>
Date: Tue, 18 Aug 2020 21:16:48 +0000
Subject: [PATCH] fld.fish: Fallback for when colordiff is missing

---
 fish/functions/fld.fish | 10 +++++++++-
 git/config              |  2 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/fish/functions/fld.fish b/fish/functions/fld.fish
index d25ffbb..20a675b 100644
--- a/fish/functions/fld.fish
+++ b/fish/functions/fld.fish
@@ -1,3 +1,11 @@
 function fld --wraps 'fossil diff'
-    command fossil diff $argv -N | colordiff | less -FRX
+    if type -q colordiff2
+        command fossil diff -N $argv | colordiff | less -FRX
+    else
+        set -l red (tput setaf 1)
+        set -l green (tput setaf 2)
+        set -l reset (tput sgr0)
+        fossil diff -N $argv | sed "s/^+.*\$/$green&$reset/" |
+            sed "s/^-.*\$/$red&$reset/" | less -FRX
+    end
 end
diff --git a/git/config b/git/config
index 2622a20..3db5c29 100644
--- a/git/config
+++ b/git/config
@@ -35,3 +35,5 @@
 
 [fetch]
 	fsckObjects = true
+[pull]
+	ff = only