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

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2015-09-01 15:02:56 -07:00
commit c130a8dab0
3 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
doc/bugs/git-annex_can__39__t_find_gpg_if_it__39__s_named_gpg2.mdwn Normal file
View file

@ -0,0 +1,19 @@
### Please describe the problem.
git-annex requires a `gpg -> gpg2` alias, which is dangerous for other software to misuse.
### What steps will reproduce the problem?
Run any gpg-requiring operation on a machine that has only gpg2 installed and no gpg alias.
gpg: createProcess: runInteractiveProcess: exec: does not exist (No such file or directory)
### What version of git-annex are you using? On what operating system?
git-annex version: 5.20150710
OS X, gpg2 installed with brew
### Have you had any luck using git-annex before?
git-annex took some time to get in the mentality and configure, but now it's a beautiful perfectly oiled file management system. Thanks!

4
doc/design/metadata.mdwn
View file

@ -79,7 +79,7 @@ subdirs.
# other uses for metadata # other uses for metadata
Uses are not limited to view branches. Users are not limited to view branches.
`git annex checkoutmeta year=2014 talk` in a subdir of master could create the `git annex checkoutmeta year=2014 talk` in a subdir of master could create the
same tree of files filter would. The user can then commit that if desired. same tree of files filter would. The user can then commit that if desired.
@ -177,7 +177,7 @@ So, possible approaches:
* Metadata should be copied to the new key when adding a modified version * Metadata should be copied to the new key when adding a modified version
of a file. **done** of a file. **done**
* Filesystems that are not case sensative (including case preserving OSX) * Filesystems that are not case sensitive (including case preserving OSX)
will cause problems if view branches try to use different cases for will cause problems if view branches try to use different cases for
2 directories representing a metadata field. 2 directories representing a metadata field.

3
doc/forum/syncing_to_an_encrypted_remove_won__39__t_prompt_with_pinentry-gtk2.mdwn Normal file
View file

@ -0,0 +1,3 @@
I'm trying to sync my unencrypted local repo to an encrypted remote located on an external drive. I'm using Debian 8.1. When I run `git-annex sync encrypted-remote` I get prompted in my shell for the password. I'm not sure why, as other places pinentry-gtk2 pops up. This is annoying because my gpg key isn't getting cached, so I have to enter my long password several times.
How can I make git-annex/git-remote-gcrypt use pinentry-gtk2?