diff options
| -rw-r--r-- | Remote/Helper/Encryptable.hs | 1 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | doc/bugs/Unclear_output_during_git-annex_copy.mdwn | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/Remote/Helper/Encryptable.hs b/Remote/Helper/Encryptable.hs index 4903cffb4..11e20d7b0 100644 --- a/Remote/Helper/Encryptable.hs +++ b/Remote/Helper/Encryptable.hs @@ -109,7 +109,6 @@ remoteCipher' c = go $ extractCipher c case M.lookup encipher cache of Just cipher -> return $ Just (cipher, encipher) Nothing -> do - showNote "gpg" cipher <- liftIO $ decryptCipher encipher Annex.changeState (\s -> s { Annex.ciphers = M.insert encipher cipher cache }) return $ Just (cipher, encipher) diff --git a/debian/changelog b/debian/changelog index 9ddb28acb..e1eec146e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,9 @@ git-annex (5.20141126) UNRELEASED; urgency=medium outside the menus. * diffdriver: New git-annex command, to make git external diff drivers work with annexed files. + * Don't show "(gpg)" when decrypting the remote encryption cipher, + since this could be taken to read that's the only time git-annex + runs gpg, which is not the case. -- Joey Hess <joeyh@debian.org> Mon, 10 Nov 2014 15:31:55 -0400 diff --git a/doc/bugs/Unclear_output_during_git-annex_copy.mdwn b/doc/bugs/Unclear_output_during_git-annex_copy.mdwn index 72485d1a6..12ae9a745 100644 --- a/doc/bugs/Unclear_output_during_git-annex_copy.mdwn +++ b/doc/bugs/Unclear_output_during_git-annex_copy.mdwn @@ -13,3 +13,5 @@ Fortunately, it appears that actually all files were encrypted (only GPGHMAC fil so this is hopefully just a cosmetic issue. git-annex version: 5.20141024-g613f396 + +> removed confusing output, [[done]] --[[Joey]] |