Sverre Rabbelier venit, vidit, dixit 13.03.2009 12:17:
> Heya,
>
> On Fri, Mar 13, 2009 at 12:15, Thomas Rast <trast@xxxxxxxxxxxxxxx>
> wrote:
>> Not to mention that this makes most source-oriented features such
>> as diff, blame, merge, etc., rather useless.
>
> I would assume that smudge takes care of this somehow, it'd seem
> like a rather useless feature otherwise :).
Sverre was being prophetic with the somehow. Here's a working setup
(though I still don't know why not to use luks):
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.
Now for Sverre's prophecy and the helper I haven't shown you yet: It
turns out that blobs are not smudged before they are fed to textconv!
[Also, it seems that the textconv config does allow parameters, bit I
haven't checked thoroughly.]
This means that e.g. when diffing work tree with HEAD textconv is called
twice: once is with a smudged file (from the work tree) and once with a
cleaned file (from HEAD). That's why I needed a small helper script
"decrypt" which does nothing but
#!/bin/sh
gpg -d -q --batch --no-tty "$1" || cat $1
Yeah, this assumes gpg errors out because it's fed something unencrypted
(and not encrypted with the wrong key) etc. It's only proof of concept
quality.
Me thinks it's not right that diff is failing to call smudge here, isn't it?
Michael
--
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
