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

This commit is contained in:
Joey Hess 2014-07-11 14:30:59 -04:00
commit ee9ffcd940
5 changed files with 55 additions and 0 deletions

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.2"
subject="comment 5"
date="2014-07-11T18:27:44Z"
content="""
The assistant defaults to assuming all files are wanted if there's no preferred content settings, while command-line dropping stuff defaults to assuming no files are wanted (or more accurately, that you'll drop anything you don't want and get anything you do) when there's no preferred content settings. So the default differs, but this only matters when not setting preferred contents.
I agree that the vicfg could be misread, so have changed it.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawncukUQl56TwiBJb7dIyAqP1YirNg_wjR4"
nickname="Matthew"
subject="comment 5"
date="2014-07-11T18:10:06Z"
content="""
Sorry to miss this previously, but, yes, whereis does indicate that it has made it to both of the remotes.
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.2"
subject="obvious questions"
date="2014-07-11T18:12:44Z"
content="""
From what source did you install git-annex?
What version of gpg is installed on your system? What is the contents of line 200 and 201 of/home/zilti/.gnupg/gpg.conf?
"""]]

View file

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.2"
subject="comment 3"
date="2014-07-11T18:15:09Z"
content="""
AFAICS there is no problem with GPG_AGENT_INFO being set while using tmux. The gpg agent works as usual and pops up a passphrase prompt window.
Is there something broken in your gpg agent that prevents it from working inside tmux, or working at all? In any case, this seems like a local misconfiruation problem and out of git-annex's scope anyway so I suppose I will close the bug.
"""]]