Skip to content

Instantly share code, notes, and snippets.

@marceloalmeida

marceloalmeida/.gitattributes

Last active December 7, 2023 14:26
Show Gist options
  • Star 5 You must be signed in to star a gist
  • Fork 3 You must be signed in to fork a gist
  • Save marceloalmeida/e6593b93b388cdf1dbc282dffd424d1b to your computer and use it in GitHub Desktop.
Save marceloalmeida/e6593b93b388cdf1dbc282dffd424d1b to your computer and use it in GitHub Desktop.
Download ZIP
How to show diffs for gpg-encrypted files?
Raw
.gitattributes
*.gpg filter=gpg diff=gpg
*.asc filter=gpg diff=gpg
Raw
README.md

How to show diffs for gpg-encrypted files?

Git supports showing diffs for encrypted files, but has to be told to do so.

git config --global diff.gpg.textconv "gpg --no-tty --decrypt"
echo "*.gpg filter=gpg diff=gpg" >> .gitattributes
echo "*.asc filter=gpg diff=gpg" >> .gitattributes

or

curl -sL https://gist.github.com/marcelosousaalmeida/e6593b93b388cdf1dbc282dffd424d1b/raw/.gitattributes -o .gitattributes
@anastygnome
Copy link

anastygnome commented Apr 13, 2021 •
edited

One may also find the following useful :
git config diff.gpg.textconv "gpg2 --decrypt -q"

@acid-bong
Copy link

pass uses textconf = gpg2 -d --quiet --yes --compress-algo=none --no-encrypt-to --batch --use-agent when configured as git repo

@nikonoid
Copy link

If you want to actually see the diff of the GPG messages that normally go to STDERR you have to use a subshell like this:
textconv = sh -c 'gpg --no-tty --decrypt $0 2>&1'

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment