feat(git): show diffs for GPG-encrypted files

https://magit.vc/manual/magit/How-to-show-diffs-for-gpg_002dencrypted-files_003f.html
yurrriq · Dec 12, 2023 · d449005 · d449005
1 parent 298eebc
commit d449005
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-8.14.0
+8.15.0
diff --git a/config/git/config.nix b/config/git/config.nix
@@ -47,6 +47,9 @@
       };
 
       diff = {
+        gpg = {
+          textconv = "gpg --no-tty --decrypt";
+        };
         sopsdiffer = {
           textconv = "sops -d";
         };
@@ -116,6 +119,10 @@
           (lib.attrValues config.accounts.email.accounts))).realName;
   };
 
+  xdg.configFile."git/attributes".text = ''
+    *.gpg filter=gpg diff=gpg
+  '';
+
   xdg.configFile."pass-git-helper/git-pass-mapping.ini" = {
     source = ./git-pass-mapping.ini;
   };

diff --git a/src/config/git/config.nw b/src/config/git/config.nw
@@ -1,3 +1,5 @@
+Configure Git.
+
 <<config/git/config.nix>>=
 { config, lib, pkgs, ... }:
 
@@ -48,6 +50,9 @@
       };
 
       diff = {
+        gpg = {
+          textconv = "gpg --no-tty --decrypt";
+        };
         sopsdiffer = {
           textconv = "sops -d";
         };
@@ -117,6 +122,10 @@
           (lib.attrValues config.accounts.email.accounts))).realName;
   };
 
+  xdg.configFile."git/attributes".text = ''
+    *.gpg filter=gpg diff=gpg
+  '';
+
   xdg.configFile."pass-git-helper/git-pass-mapping.ini" = {
     source = ./git-pass-mapping.ini;
   };