From b5471736ffaa0c662ee4b80499751feec3abe2d2 Mon Sep 17 00:00:00 2001
From: Nils Dijk <nils@citusdata.com>
Date: Fri, 13 May 2022 13:22:14 +0200
Subject: [PATCH] configure diff-so-fancy

---
 .devcontainer/Dockerfile        | 4 +++-
 .devcontainer/devcontainer.json | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 8e44583da..ce94b36e3 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -140,7 +140,9 @@ RUN git clone https://github.com/citusdata/tools.git citus-tools \
 
 # TODO some LC_ALL errors, possibly solved by locale-gen
 RUN git clone https://github.com/so-fancy/diff-so-fancy.git \
- && ln -s /home/citus/diff-so-fancy/diff-so-fancy .bin/
+ && ln -s /home/citus/diff-so-fancy/diff-so-fancy .bin/ \
+ && git config --global core.pager "diff-so-fancy | less --tabs=4 -RFX" \
+ && git config --global interactive.diffFilter "diff-so-fancy --patch"
 
 # place to run your cluster with citus_dev
 VOLUME /data
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index ffc896387..bac0748d0 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,5 +1,5 @@
 {
-    "image": "citus/devcontainer:dev-20220509",
+    "image": "citus/devcontainer:dev-20220513",
     "runArgs": [
         "--cap-add=SYS_PTRACE",
         "--security-opt",