marceloalmeida/.gitattributes

Last active July 11, 2024 20:15

Star () You must be signed in to star a gist
Fork () You must be signed in to fork a gist

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/marceloalmeida/e6593b93b388cdf1dbc282dffd424d1b.js"></script>
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

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 commented Apr 13, 2021 •

edited

Loading

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

acid-bong commented Oct 27, 2022

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

nikonoid commented Mar 24, 2023

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