Michael J Gruber <michaeljgruber+gmane@xxxxxxxxxxx> writes: > In .gitattributes (or.git/info/a..) use > > * filter=gpg diff=gpg > > In your config: > > [filter "gpg"] > smudge = gpg -d -q --batch --no-tty > clean = gpg -ea -q --batch --no-tty -r C920A124 > [diff "gpg"] > textconv = decrypt > > This gives you textual diffs even in log! You want use gpg-agent here. Don't do this. Think why the smudge/clean pair exists. The version controlled data, the contents, may not be suitable for consumption in the work tree in its verbatim form. For example, a cross platform project would want to consistently use LF line termination inside a repository, but on a platform whose tools expect CRLF line endings, the contents cannot be used verbatim. We "smudge" the contents running unix2dos when checking things out on such platforms, and "clean" the platform specific CRLF line endings by running dos2unix when checking things in. By doing so, you can see what really got changed between versions without getting distracted, and more importantly, "you" in this sentence is not limited to the human end users alone. git internally runs diff and xdelta to see what was changed, so that: * it can reduce storage requirement when it runs pack-objects; * it can check what path in the preimage was similar to what other path in the postimage, to deduce a rename; * it can check what blocks of lines in the postimage came from what other blocks of lines in the preimage, to pass blames across file boundaries. If your "clean" encrypts and "smudge" decrypts, it means you are refusing all the benifit git offers. You are making a pair of similar "smudged" contents totally dissimilar in their "clean" counterparts. That is simply backwards. As the sole raison d'etre of diff.textconv is to allow potentially lossy conversion (e.g. msword-to-text) applied to the preimage and postimage pair of contents (that are supposed to be "clean") before giving a textual diff to human consumption, the above config may appear to work, but if you really want an encrypted repository, you should be using an encrypting filesystem. That would give an added benefit that the work tree associated with your repository would also be encrypted. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
