summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Le Thiec <samuel.lethiec@intelunix.fr>2014-05-10 17:18:30 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2014-05-10 17:22:28 +0200
commit3e052d8455846669a831bd3eb11b441da804b75d (patch)
tree1620dcc9e29892bd9814c88cc984d112ed6c43e3
parentba160d43eb84be181258c26aa66bcaf05964c909 (diff)
downloadpass-3e052d8455846669a831bd3eb11b441da804b75d.tar.gz
pass-3e052d8455846669a831bd3eb11b441da804b75d.tar.bz2
pass-3e052d8455846669a831bd3eb11b441da804b75d.zip
configure git to decrypt gpg files automatically
- usefull for git commands showing diff, e.g.: pass git log -p - from what I can see, not 'cleartext' temporary files are created
Diffstat (limited to '')
-rwxr-xr-xsrc/password-store.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/password-store.sh b/src/password-store.sh
index a4783b4..f466a8f 100755
--- a/src/password-store.sh
+++ b/src/password-store.sh
@@ -557,6 +557,11 @@ cmd_git() {
if [[ $1 == "init" ]]; then
git "$@" || exit 1
git_add_file "$PREFIX" "Add current contents of password store."
+
+ echo '*.gpg diff=gpg' > "$PREFIX/.gitattributes"
+ git_add_file .gitattributes "Assigning diff attribute for gpg files"
+ git config --local diff.gpg.binary true
+ git config --local diff.gpg.textconv "$GPG ${GPG_OPTS[*]} --decrypt"
elif [[ -d $GIT_DIR ]]; then
exec git "$@"
else
7-7/+22 2009-07-31ui-commit: add support for 'commit-filter' optionLars Hjemli4-0/+17 2009-07-31ui-tree: add support for source-filter optionLars Hjemli4-4/+25 2009-07-31ui-snapshot: use cgit_{open|close}_filter() to execute compressorsLars Hjemli1-28/+7 2009-07-31Add generic filter/plugin infrastructureLars Hjemli3-0/+62 2009-07-25Add support for mime type registration and lookupLars Hjemli4-5/+45 2009-07-25cgit.h: keep config flags sortedLars Hjemli1-2/+2 2009-07-25cgitrc.5.txt: document 'embedded' and 'noheader'Lars Hjemli1-0/+9 2009-07-25Add support for 'noheader' optionLars Hjemli3-7/+16 2009-07-25cgitrc.5.txt: document 'head-include'Lars Hjemli1-0/+4 2009-07-25ui-blob: return 'application/octet-stream' for binary blobsLars Hjemli1-1/+7 2009-07-25ui-plain: Return 'application/octet-stream' for binary files.Remko Tronçon1-1/+4 2009-06-11use cgit_httpscheme() for atom feedDiego Ongaro2-3/+6 2009-06-11add cgit_httpscheme() -> http:// or https://Diego Ongaro2-0/+12 2009-06-07Return http statuscode 404 on unknown branchLars Hjemli3-0/+6 2009-06-07Add head-include configuration option.Mark Lodato3-1/+6 2009-03-15CGIT 0.8.2.1v0.8.2.1Lars Hjemli1-1/+1 2009-03-15Fix doc-related glitches in Makefile and .gitignoreLars Hjemli2-1/+6 2009-03-15ui-snapshot: avoid segfault when no filename is specifiedLars Hjemli1-6/+17 2009-03-15fix segfault when displaying empty blobsEric Wong1-5/+8 2009-02-19Add support for HEAD requestsLars Hjemli2-0/+7 2009-02-19Add support for ETag in 'plain' viewLars Hjemli4-0/+5 2009-02-12ui-tree: escape ascii-text properly in hexdump viewLars Hjemli1-4/+9 2009-02-12Makefile: add doc-related targetsLars Hjemli1-2/+17