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

8 files changed, 93 insertions, 0 deletions

diff --git a/doc/bugs/wget_tarball_over_https_complains.mdwn b/doc/bugs/wget_tarball_over_https_complains.mdwn
index 310ca7682..c318a1b4a 100644
--- a/doc/bugs/wget_tarball_over_https_complains.mdwn
+++ b/doc/bugs/wget_tarball_over_https_complains.mdwn
@@ -11,3 +11,5 @@ Connecting to downloads.kitenet.net|107.170.31.195|:443... connected.
 ERROR: certificate common name "kitenet.net" doesn\'t match requested host name "downloads.kitenet.net".
 To connect to downloads.kitenet.net insecurely, use '--no-check-certificate'.
 """]]
+
+> [[done]]: Per joey's comment, I'll investigate my broken wget
diff --git a/doc/bugs/wget_tarball_over_https_complains/comment_1_4227a75f2eb0de6a2422efe8d791e130._comment b/doc/bugs/wget_tarball_over_https_complains/comment_1_4227a75f2eb0de6a2422efe8d791e130._comment
new file mode 100644
index 000000000..7f8c906a1
--- /dev/null
+++ b/doc/bugs/wget_tarball_over_https_complains/comment_1_4227a75f2eb0de6a2422efe8d791e130._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 1"
+ date="2014-05-15T19:56:53Z"
+ content="""
+I don't know why this would happen. The https cert for downloads.kitenet.net is a wildcard cert for *.kitenet.net.
+
+Also, I cannot reproduce it with wget on either debian stable or unstable. So it seems more likely to be a bug in your wget than anything..
+"""]]
diff --git a/doc/forum/error:_refs__47__heads__47__git-annex_does_not_point_to_a_valid_object__33__/comment_1_d370b044da3bfebf9e4c90ce1e243587._comment b/doc/forum/error:_refs__47__heads__47__git-annex_does_not_point_to_a_valid_object__33__/comment_1_d370b044da3bfebf9e4c90ce1e243587._comment
new file mode 100644
index 000000000..cf7601d40
--- /dev/null
+++ b/doc/forum/error:_refs__47__heads__47__git-annex_does_not_point_to_a_valid_object__33__/comment_1_d370b044da3bfebf9e4c90ce1e243587._comment
@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 1"
+ date="2014-05-15T20:22:40Z"
+ content="""
+This means that a git commit's data has gotten lost somehow. You can verify that by trying
+
+    git show 993859515190743e9bed7fc8e697d5ac4e2d03a0
+
+The most common reason for this to happen is if the system is shutdown unexpectedly while git-annex is running. Or, if this repository is on a removable drive, if it got removed before the data could be written.
+
+You can probably fix the problem by running:
+
+    git annex repair
+
+(Code formatting: Use 4 spaces.)
+"""]]
diff --git a/doc/forum/remembering_state/comment_3_b48775ea1e90b061b084f61a4a9baca5._comment b/doc/forum/remembering_state/comment_3_b48775ea1e90b061b084f61a4a9baca5._comment
new file mode 100644
index 000000000..2b349527c
--- /dev/null
+++ b/doc/forum/remembering_state/comment_3_b48775ea1e90b061b084f61a4a9baca5._comment
@@ -0,0 +1,19 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 3"
+ date="2014-05-15T20:01:14Z"
+ content="""
+While you can certianly use views for this, I tend to do the same with my sound files without view, but just using location tracking info. I have a set of music I'm currently listening to, and want to have more or less the same files on multiple computers as I have on my laptop. With maybe a bit more on some computers with more space. So, I do:
+
+    git annex sync
+    git annex get --in darkstar
+
+Where \"darkstar\" is the name of the repository on my laptop. 
+
+Another nice trick that also takes advantage of the location tracking logs is this to get back some files you dropped temporarily to free up space:
+
+    git annex get --in='here@{yesterday}'
+
+
+"""]]
diff --git a/doc/sync/comment_15_168e0ab10b4084e13df1a3058fa7e8a9._comment b/doc/sync/comment_15_168e0ab10b4084e13df1a3058fa7e8a9._comment
new file mode 100644
index 000000000..94d34a2a8
--- /dev/null
+++ b/doc/sync/comment_15_168e0ab10b4084e13df1a3058fa7e8a9._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 15"
+ date="2014-05-15T19:53:16Z"
+ content="""
+We seem to have some rumor going around that `git annex sync` pushes all branches. It does not. It pushes only the git-annex branch and the currently checked out branch.
+"""]]
diff --git a/doc/sync/comment_16_96096f994fc55f921f2b24b274f998f7._comment b/doc/sync/comment_16_96096f994fc55f921f2b24b274f998f7._comment
new file mode 100644
index 000000000..587444d36
--- /dev/null
+++ b/doc/sync/comment_16_96096f994fc55f921f2b24b274f998f7._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 16"
+ date="2014-05-15T19:54:54Z"
+ content="""
+@Matthias, `git annex sync --content` has to check each file to see if any other repository wants it. This is necessarily going to get slow when there are a lot of files. The assistant does a similar syncing but uses some tricks to avoid scanning all the files too often, while still managing to keep them all in sync -- it can do this since it's a long-running daemon and is aware when files have changed.
+"""]]
diff --git a/doc/todo/Allow_syncing_only_selected_branches/comment_1_bb687b1a50d8a926abd16ada639140e1._comment b/doc/todo/Allow_syncing_only_selected_branches/comment_1_bb687b1a50d8a926abd16ada639140e1._comment
new file mode 100644
index 000000000..00f18cf72
--- /dev/null
+++ b/doc/todo/Allow_syncing_only_selected_branches/comment_1_bb687b1a50d8a926abd16ada639140e1._comment
@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 1"
+ date="2014-05-15T19:51:48Z"
+ content="""
+No, it does not:
+
+<pre>
+push wren 
+[2014-05-15 15:50:33 JEST] call: git [\"--git-dir=/home/joey/lib/big/.git\",\"--work-tree=/home/joey/lib/big\",\"push\",\"wren\",\"+git-annex:synced/git-annex\",\"master:synced/master\"]
+[2014-05-15 15:50:39 JEST] read: git [\"--git-dir=/home/joey/lib/big/.git\",\"--work-tree=/home/joey/lib/big\",\"push\",\"wren\",\"master\"]
+</pre>
+
+That is the entirity of what's pushed: The git-annex branch, and the currently checked out branch. 
+
+I don't see a bug here.
+"""]]
diff --git a/doc/todo/windows_support/comment_12_d3d91ddc00bc275455022d86b779b148._comment b/doc/todo/windows_support/comment_12_d3d91ddc00bc275455022d86b779b148._comment
new file mode 100644
index 000000000..df4545911
--- /dev/null
+++ b/doc/todo/windows_support/comment_12_d3d91ddc00bc275455022d86b779b148._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="108.236.230.124"
+ subject="comment 12"
+ date="2014-05-15T20:36:09Z"
+ content="""
+@Dominik, thanks for the links. Now that the webapp handles prompting for ssh passwords, the console is entirely vestigial and I'd like to get rid of it. The sc commands seems possible to use; there are also haskell libraries for building windows services.
+
+The tricky part is that multiple git-annex assistant processes can be running, if there are multiple local repositories. This seems to be hard to do as a service.
+"""]]