From: Michael J Gruber <michaeljgruber+gmane@fastmail.fm>
To: Sverre Rabbelier <srabbelier@gmail.com>
Cc: Thomas Rast <trast@student.ethz.ch>,
Michael J Gruber <git@drmicha.warpmail.net>,
Matthias Nothhaft <matthias.nothhaft@googlemail.com>,
git@vger.kernel.org
Subject: Re: Transparently encrypt repository contents with GPG
Date: Fri, 13 Mar 2009 14:56:22 +0100 [thread overview]
Message-ID: <49BA6606.1070403@fastmail.fm> (raw)
In-Reply-To: <fabb9a1e0903130417x36121bd5ya8b323e0a80bbd8f@mail.gmail.com>
Sverre Rabbelier venit, vidit, dixit 13.03.2009 12:17:
> Heya,
>
> On Fri, Mar 13, 2009 at 12:15, Thomas Rast <trast@student.ethz.ch>
> 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
next prev parent reply other threads:[~2009-03-13 13:58 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-12 21:19 Transparently encrypt repository contents with GPG Matthias Nothhaft
2009-03-12 21:34 ` Sverre Rabbelier
2009-03-13 10:46 ` Michael J Gruber
2009-03-13 10:51 ` Sverre Rabbelier
2009-03-13 11:15 ` Thomas Rast
2009-03-13 11:17 ` Sverre Rabbelier
2009-03-13 13:56 ` Michael J Gruber [this message]
2009-03-13 14:19 ` Sverre Rabbelier
2009-03-13 17:13 ` Jeff King
2009-03-13 20:23 ` Junio C Hamano
2009-03-14 11:16 ` Michael J Gruber
2009-03-14 18:45 ` Junio C Hamano
2009-03-16 16:01 ` Michael J Gruber
2009-03-17 7:40 ` Jeff King
2009-03-17 8:22 ` Jeff King
2012-04-21 17:25 ` bigbear
2012-06-17 7:33 ` lalebarde
[not found] ` <CAL1Gx-Ufs8TNVeeefAXBnX-eCnEk_DC1w6oJVRPcMcStdL_+-Q@mail.gmail.com>
2012-06-18 20:03 ` lalebarde
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=49BA6606.1070403@fastmail.fm \
--to=michaeljgruber+gmane@fastmail.fm \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=matthias.nothhaft@googlemail.com \
--cc=srabbelier@gmail.com \
--cc=trast@student.ethz.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.