Skip to content

Commit

Permalink
Reverse solution from GH-64
Browse files Browse the repository at this point in the history
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
  • Loading branch information
arcticicestudio committed Sep 8, 2018
1 parent 8e47b17 commit b9d8518
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 21 deletions.
12 changes: 0 additions & 12 deletions snowblocks/git/git-diff-igloocrypt

This file was deleted.

4 changes: 3 additions & 1 deletion snowblocks/git/gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 0 additions & 7 deletions snowblocks/git/gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -70,10 +67,6 @@
[interactive]
diffFilter = diff-so-fancy

[filter "igloocrypt"]
clean = "gpg --encrypt --recipient 60C54F1519346085"
smudge = "gpg --decrypt"

[merge]
tool = intellij
ff = false
Expand Down
1 change: 0 additions & 1 deletion snowblocks/git/snowblock.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
}
},
"~/.git-commit-msg": null,
"~/.git-diff-igloocrypt": null,
"~/.gitconfig": null,
"~/.gitconfig_auth": {
"hosts": {
Expand Down

0 comments on commit b9d8518

Please sign in to comment.