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

3 files changed, 46 insertions, 0 deletions

diff --git a/doc/bugs/webapp_missing_in_20150522_release/comment_1_087ea0e3712869b440d31714e0fb068a._comment b/doc/bugs/webapp_missing_in_20150522_release/comment_1_087ea0e3712869b440d31714e0fb068a._comment
new file mode 100644
index 000000000..6de0ae6f9
--- /dev/null
+++ b/doc/bugs/webapp_missing_in_20150522_release/comment_1_087ea0e3712869b440d31714e0fb068a._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="git-annex@8c58bb43191e0443be5d100448ba874284c5a778"
+ nickname="git-annex"
+ subject="OSX Homebrew Has Same Failure"
+ date="2016-01-13T00:09:13Z"
+ content="""
+Unfortunately this issues also exists in the OSX Homebrew release of version 5.20151218
+
+> build flags: Assistant Pairing Testsuite WebDAV FsEvents XMPP ConcurrentOutput DNS Feeds Quvi TDFA TorrentParser Database
+> key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 SHA1E SHA1 MD5E MD5 WORM URL
+> remote types: git gcrypt bup directory rsync web bittorrent webdav tahoe glacier ddar hook external
+
+
+"""]]
diff --git a/doc/forum/files_got_replaced_by_broken_symblinks__44___how_to_get_them_back__63__.mdwn b/doc/forum/files_got_replaced_by_broken_symblinks__44___how_to_get_them_back__63__.mdwn
new file mode 100644
index 000000000..5a90d1535
--- /dev/null
+++ b/doc/forum/files_got_replaced_by_broken_symblinks__44___how_to_get_them_back__63__.mdwn
@@ -0,0 +1,23 @@
+Basically, this is how it looks now (this is part of my music collection, but there are other directories with the same symptoms):
+
+    simon@simon-desktop /run/media/simon/TOSHIBA EXT/Stuff/Music/Amy Kuney - Breaking Bad Habits EP (2006) ±annex/direct/master » ls -l
+    insgesamt 4
+    -rwxrwxrwx 1 simon simon 196  7. Dez 13:37 01 So Help Me God.mp3
+    -rwxrwxrwx 1 simon simon 196  7. Dez 13:37 02 Sore Loser.mp3
+    -rwxrwxrwx 1 simon simon 196  7. Dez 13:37 03 How The Wind Must Feel.mp3
+    -rwxrwxrwx 1 simon simon 196  7. Dez 13:37 04 Sold Out.mp3
+    -rwxrwxrwx 1 simon simon 196  7. Dez 13:37 05 In The Dark.mp3
+    -rwxrwxrwx 1 simon simon 196  7. Dez 13:37 06 Breaking Bad Habits.mp3
+    -rwxrwxrwx 1 simon simon 196  7. Dez 13:37 AmyKuneyEP.jpg
+    simon@simon-desktop /run/media/simon/TOSHIBA EXT/Stuff/Music/Amy Kuney - Breaking Bad Habits EP (2006) ±annex/direct/master » cat 01\ So\ Help\ Me\ God.mp3 
+    ../../.git/annex/objects/M5/Pq/SHA256E-s213--96db10197b716998d35576c39fc2468bd197b5a4ba2bec14a78454b278d96498.mp3/SHA256E-s213--96db10197b716998d35576c39fc2468bd197b5a4ba2bec14a78454b278d96498.mp3%
+    simon@simon-desktop /run/media/simon/TOSHIBA EXT/Stuff/Music/Amy Kuney - Breaking Bad Habits EP (2006) ±annex/direct/master » ls ../../.git/annex/objects/M5
+    ls: Zugriff auf ../../.git/annex/objects/M5 nicht möglich: Datei oder Verzeichnis nicht gefunden
+    simon@simon-desktop /run/media/simon/TOSHIBA EXT/Stuff/Music/Amy Kuney - Breaking Bad Habits EP (2006) ±annex/direct/master » find ../../.git/annex | grep 96db10197b716998d3557                               2 ↵
+    ../../.git/annex/objects/a5b/e78/SHA256E-s213--96db10197b716998d35576c39fc2468bd197b5a4ba2bec14a78454b278d96498.mp3
+    ../../.git/annex/objects/a5b/e78/SHA256E-s213--96db10197b716998d35576c39fc2468bd197b5a4ba2bec14a78454b278d96498.mp3/SHA256E-s213--96db10197b716998d35576c39fc2468bd197b5a4ba2bec14a78454b278d96498.mp3.map
+    simon@simon-desktop /run/media/simon/TOSHIBA EXT/Stuff/Music/Amy Kuney - Breaking Bad Habits EP (2006) ±annex/direct/master » git annex info  
+    repository mode: direct
+
+So, I only have a bunch of text files containing file paths. The actual files are in .git/annex/objects somewhere, but not exactly in the path specified in those text files. I'm not sure how it ended up that way, I'm in direct mode after all.
+For starters, I would like to know how I can repair this mess.
diff --git a/doc/tips/Accessing_files_in_bare_remotes_without_git-annex/comment_1_9243af1c87fdaf33e336ec34e99c0f74._comment b/doc/tips/Accessing_files_in_bare_remotes_without_git-annex/comment_1_9243af1c87fdaf33e336ec34e99c0f74._comment
new file mode 100644
index 000000000..4843f702a
--- /dev/null
+++ b/doc/tips/Accessing_files_in_bare_remotes_without_git-annex/comment_1_9243af1c87fdaf33e336ec34e99c0f74._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="emanuele.ruffaldi@56b9c9a5c1f873994b869248e9b53aa20f437d20"
+ nickname="emanuele.ruffaldi"
+ subject="Updated"
+ date="2016-01-12T22:47:49Z"
+ content="""
+- support for non-bare repositories
+- option for creating a tar file containing all the master checked out with the symbolic links to the content files. This is mountable with the archivemount tool
+"""]]