From b9d8518472190524a6b0f6a9a64756363e2b8cea Mon Sep 17 00:00:00 2001
From: Arctic Ice Studio <development@arcticicestudio.com>
Date: Sat, 8 Sep 2018 15:31:33 +0200
Subject: [PATCH] Reverse solution from GH-64

1. Deleted the custom `git-diff-igloocrypt` script
2. Removed the custom `[diff "igloocrypt"]` section from the
   `gitconfig` file
3. Removed the custom filter "igloocrypt" from the `gitconfig` file
4. Updated the `filter` and `diff` custom global Git attributes handler
   for all `*.igloocrypt` files to the new `git-crypt` setup

GH-113
---
 snowblocks/git/git-diff-igloocrypt | 12 ------------
 snowblocks/git/gitattributes       |  4 +++-
 snowblocks/git/gitconfig           |  7 -------
 snowblocks/git/snowblock.json      |  1 -
 4 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100755 snowblocks/git/git-diff-igloocrypt

diff --git a/snowblocks/git/git-diff-igloocrypt b/snowblocks/git/git-diff-igloocrypt
deleted file mode 100755
index a3080d4..0000000
--- a/snowblocks/git/git-diff-igloocrypt
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (c) 2016-2017 Arctic Ice Studio <development@arcticicestudio.com>
-# Copyright (c) 2016-2017 Sven Greb <code@svengreb.de>
-
-# Project:    igloo
-# Repository: https://github.com/arcticicestudio/igloo
-# License:    MIT
-
-# GPG decryption command for the "igloocrypt" diff filter
-# The output is redirected to suppress error messages caused by the Git filter flow.
-
-gpg --decrypt --batch --no-tty "$1" > /dev/null 2>&1 || cat $1
diff --git a/snowblocks/git/gitattributes b/snowblocks/git/gitattributes
index 400e25b..2fa4441 100644
--- a/snowblocks/git/gitattributes
+++ b/snowblocks/git/gitattributes
@@ -10,5 +10,7 @@
 #   https://www.gnupg.org
 #   https://wiki.archlinux.org/index.php/GnuPG
 
-*.igloocrypt filter=igloocrypt diff=igloocrypt
+*.igloocrypt filter=git-crypt diff=git-crypt
 .gitattributes !filter !diff
+.gitignore !filter !diff
+.gitmodules !filter !diff
diff --git a/snowblocks/git/gitconfig b/snowblocks/git/gitconfig
index 35874a9..a65ec72 100755
--- a/snowblocks/git/gitconfig
+++ b/snowblocks/git/gitconfig
@@ -54,9 +54,6 @@
   tool = intellij
   compactionHeuristic = true
 
-[diff "igloocrypt"]
-  textconv = "~/.git-diff-igloocrypt"
-
 [difftool "intellij"]
   prompt = true
   cmd = idea diff $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE")
@@ -70,10 +67,6 @@
 [interactive]
   diffFilter = diff-so-fancy
 
-[filter "igloocrypt"]
-  clean = "gpg --encrypt --recipient 60C54F1519346085"
-  smudge = "gpg --decrypt"
-
 [merge]
   tool = intellij
   ff = false
diff --git a/snowblocks/git/snowblock.json b/snowblocks/git/snowblock.json
index 424439a..471b96a 100644
--- a/snowblocks/git/snowblock.json
+++ b/snowblocks/git/snowblock.json
@@ -11,7 +11,6 @@
         }
       },
       "~/.git-commit-msg": null,
-      "~/.git-diff-igloocrypt": null,
       "~/.gitconfig": null,
       "~/.gitconfig_auth": {
         "hosts": {