diff options
7 files changed, 36 insertions, 4 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/Default_startup_command.mdwn b/doc/bugs/Default_startup_command.mdwn index 172733fa7..eb21cd008 100644 --- a/doc/bugs/Default_startup_command.mdwn +++ b/doc/bugs/Default_startup_command.mdwn @@ -1,3 +1,5 @@ +[[!meta title="Android Default startup command"]] + ### Please describe the problem. On a CM11 4.4.4 install, the startup will fail with the default startup command "git annex webapp". The error message shown is: 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]] diff --git a/doc/forum/OSX__39__s_default_sshd_behaviour_has_limited_paths_set/comment_3_521f34c340ad54cef6458a8b6cfff8a9._comment b/doc/forum/OSX__39__s_default_sshd_behaviour_has_limited_paths_set/comment_3_521f34c340ad54cef6458a8b6cfff8a9._comment new file mode 100644 index 000000000..088aa7551 --- /dev/null +++ b/doc/forum/OSX__39__s_default_sshd_behaviour_has_limited_paths_set/comment_3_521f34c340ad54cef6458a8b6cfff8a9._comment @@ -0,0 +1,13 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 3""" + date="2014-12-02T17:42:36Z" + content=""" +When the git-annex webapp is used to add a ssh repository, it +installs a ssh key in `~/.ssh/authorized_keys`, which makes +ssh run `~/.ssh/git-annex-shell` if necessary. + +This is not done for you if you set up a ssh remote using git at the +commend line. In that case, arranging for git-annex-shell to be in PATH +on the remote host somehow is left up to you. +"""]] diff --git a/doc/forum/Shared_Encryption_does_not_Work_as_Expected/comment_2_6b603265a2fc78bd2df54102bf94234f._comment b/doc/forum/Shared_Encryption_does_not_Work_as_Expected/comment_2_6b603265a2fc78bd2df54102bf94234f._comment new file mode 100644 index 000000000..bec7954c8 --- /dev/null +++ b/doc/forum/Shared_Encryption_does_not_Work_as_Expected/comment_2_6b603265a2fc78bd2df54102bf94234f._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 2""" + date="2014-12-02T17:37:49Z" + content=""" +Symlinks to read-only files in .git/annex/objects is how a git-annex +repository normally looks. + +Perhaps you want to use [[direct_mode]]? + +This has nothing to do with shared encryption that I can see. +"""]] diff --git a/doc/install/OSX.mdwn b/doc/install/OSX.mdwn index b630c1e08..7d272be58 100644 --- a/doc/install/OSX.mdwn +++ b/doc/install/OSX.mdwn @@ -3,7 +3,7 @@ [[!img /assistant/osx-app.png align=right link=/assistant]] For easy installation, use the prebuilt app bundle. -* 10.10 Yosemite: [git-annex.dmg](https://downloads.kitenet.net/git-annex/OSX/current/10.10_Yosemite/git-annex.dmg) +* 10.10 Yosemite / 10.9 Mavericks: [git-annex.dmg](https://downloads.kitenet.net/git-annex/OSX/current/10.10_Yosemite/git-annex.dmg) * 10.8.2 Mountain Lion: [git-annex.dmg.bz2](https://downloads.kitenet.net/git-annex/OSX/current/10.8.2_Mountain_Lion/git-annex.dmg.bz2) **warning: not being updated any longer** * 10.7.5 Lion: [git-annex.dmg](https://downloads.kitenet.net/git-annex/OSX/current/10.7.5_Lion/git-annex.dmg) **warning: not being updated any longer** @@ -20,8 +20,9 @@ several more. Handy if you don't otherwise have git installed. ## autobuilds -[[Joey]] autobuilds the app for 10.10 Yosemite, thanks to Kevin McKenzie -for hosting the autobuilder. +[[Joey]] autobuilds the app for 10.10 Yosemite +(also reported to work on 10.9 Mavericks). +Thanks to Kevin McKenzie for hosting the autobuilder. * [autobuild of git-annex.dmg](https://downloads.kitenet.net/git-annex/autobuild/x86_64-apple-yosemite/git-annex.dmg) ([build logs](https://downloads.kitenet.net/git-annex/autobuild/x86_64-apple-yosemite/)) |