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

This commit is contained in:
Joey Hess 2013-02-12 19:52:49 -04:00
commit f2cb275513
4 changed files with 41 additions and 1 deletions

View file

@ -0,0 +1,22 @@
What steps will reproduce the problem?
1. create a git annex repo on a server
2. clone it on workstation
3. open the webapp on the workstation
What is the expected output? What do you see instead?
The webapp should show the 'origin' remote and the assistant should ensure syncing.
Instead the remote does not show up in the webapp.
I checked with `git annex status` and the remote is there.
What version of git-annex are you using? On what operating system?
3.20130207 on latest Ubuntu
Please provide any additional information below.
I tried both with direct and indirect mode for the local annex repo.
I am sorry if I am missing the point. I checked the docs, however without much success.

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.108.183"
subject="comment 3"
date="2013-02-12T15:42:57Z"
content="""
What can happen is that `.config/git-annex/autostart` can list a repository that is somehow trashed. For example, I've seen this when I let the webapp make a repository, and then manually deleted the directory, while the webapp was running. The webapp then re-creates the directory, but it's not a valid git repo, just a mostly empty directory.
Tend to see this as user error though..
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus"
nickname="Jimmy"
subject="comment 1"
date="2013-02-12T10:24:50Z"
content="""
heh, +1 for removing the need for pcre
"""]]

View file

@ -6,7 +6,7 @@ locally paired systems, and remote servers with rsync.
Help me prioritize my work: What special remote would you most like
to use with the git-annex assistant?
[[!poll open=yes 15 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 9 "Box.com (done)" 68 "My phone (or MP3 player)" 18 "Tahoe-LAFS" 6 "OpenStack SWIFT" 25 "Google Drive"]]
[[!poll open=yes 15 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 9 "Box.com (done)" 68 "My phone (or MP3 player)" 18 "Tahoe-LAFS" 6 "OpenStack SWIFT" 26 "Google Drive"]]
This poll is ordered with the options I consider easiest to build
listed first. Mostly because git-annex already supports them and they