diff options
authorPaul Sokolovsky <paul.sokolovsky@linaro.org>2014-03-21 18:49:33 +0200
committerPaul Sokolovsky <paul.sokolovsky@linaro.org>2014-03-21 18:49:33 +0200
commitcb7795ffecdc9225b88e74d0da65559b4786e924 (patch)
parent13b703eae69390844db24ffd0000c8277aa5bd4f (diff)
Remove --batch --no-tty options when decrypting symmetrical key.
There's no reason why we can't ask user for password on the terminal where git command is run. ...Except it's not practical to do so on user's side, so add note to README on the important of GPG agent. Change-Id: Ia9e463369c1091ed8fdade325d5df4537eb232e9
2 files changed, 6 insertions, 1 deletions
diff --git a/README b/README
index f42a08e..9dc3a25 100644
--- a/README
+++ b/README
@@ -19,6 +19,11 @@ Installation
1. git clone https://git.linaro.org/infrastructure/git-gpgcrypt.git
2. Put git-gpgcrypt/git-gpgcrypt somewhere on PATH
+3. Make sure you have GPG agent set up and running - either GPG's own
+gpg-agent or integration with your desktop environment (most Linux
+desktop environment have this out of the box, e.g. in Ubuntu). It's
+impractical to use git-gpgcrypt without an agent - you will get multiple
+password prompts for each git command.
New repository
diff --git a/git-gpgcrypt b/git-gpgcrypt
index 8842d37..fd830d1 100755
--- a/git-gpgcrypt
+++ b/git-gpgcrypt
@@ -79,7 +79,7 @@ setup_filters() {
get_key() {
- gpg -d -q --batch --no-tty .gpgcrypt-key
+ gpg -d -q .gpgcrypt-key
get_salt() {