mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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.

Browse source
This commit is contained in:
Joey Hess 2014-12-02 13:50:45 -04:00
parent 17a76b6292
commit 55fa1789dd
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Remote/Helper/Encryptable.hs
View file

@ -109,7 +109,6 @@ remoteCipher' c = go $ extractCipher c
case M.lookup encipher cache of case M.lookup encipher cache of
Just cipher -> return $ Just (cipher, encipher) Just cipher -> return $ Just (cipher, encipher)
Nothing -> do Nothing -> do
showNote "gpg"
cipher <- liftIO $ decryptCipher encipher cipher <- liftIO $ decryptCipher encipher
Annex.changeState (\s -> s { Annex.ciphers = M.insert encipher cipher cache }) Annex.changeState (\s -> s { Annex.ciphers = M.insert encipher cipher cache })
return $ Just (cipher, encipher) return $ Just (cipher, encipher)

3
debian/changelog vendored
View file

@ -15,6 +15,9 @@ git-annex (5.20141126) UNRELEASED; urgency=medium
outside the menus. outside the menus.
* diffdriver: New git-annex command, to make git external diff drivers * diffdriver: New git-annex command, to make git external diff drivers
work with annexed files. 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 -- Joey Hess <joeyh@debian.org> Mon, 10 Nov 2014 15:31:55 -0400

2
doc/bugs/Unclear_output_during_git-annex_copy.mdwn
View file

@ -13,3 +13,5 @@ Fortunately, it appears that actually all files were encrypted (only GPGHMAC fil
so this is hopefully just a cosmetic issue. so this is hopefully just a cosmetic issue.
git-annex version: 5.20141024-g613f396 git-annex version: 5.20141024-g613f396
> removed confusing output, [[done]] --[[Joey]]