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

5 files changed, 81 insertions, 0 deletions

diff --git a/doc/bugs/Android_cannot_setup_gitlab_repo_due_to_ECDSA_key.mdwn b/doc/bugs/Android_cannot_setup_gitlab_repo_due_to_ECDSA_key.mdwn
new file mode 100644
index 000000000..fea52a7ed
--- /dev/null
+++ b/doc/bugs/Android_cannot_setup_gitlab_repo_due_to_ECDSA_key.mdwn
@@ -0,0 +1,40 @@
+### Please describe the problem.
+Cannot add gitlab repository on Android.
+
+### What steps will reproduce the problem?
+After attempting to add a gitlab repository on git-annex assistant, I am presented with a ssh key and prompted to add it to my gitlab account. After doing so and continuing, git-annex assistant returns to the same page and presents the ssh key again. Attempting to continue repeats the cycle as the ssh key is presented over and over.
+
+### What version of git-annex are you using? On what operating system?
+Stable version for Lollipop (I experienced this same error on Kit Kat ~6 months ago but could not resolve it at that point)
+Android 5.0 git-annex.apk
+
+### Please provide any additional information below.
+In the git-annex assistant log I see:
+
+    No ECDSA host key is known for gitlab.com and you have requested strict checking. 
+    Host key verification failed. 
+    No ECDSA host key is known for gitlab.com and you have requested strict checking. 
+    Host key verification failed. 
+    fatal: Could not read from remote repository
+    
+    Please make sure you have the correct access rights and the repository exists.
+    Host key verification failed.
+    Host key verification failed.
+    fatal: Could not read from remote repository.
+
+I resolved the issue by opening a new terminal window, attempting to connect to gitlab (ssh git@gitlab.com), verifying the ECDSA key against the gitlab website (https://about.gitlab.com/gitlab-com/) and accepting the key. The file .ssh/known_hosts was created. The gitlab repository could then be added in git annex assistant.
+
+The lack of information about the error presented to the user in git annex assistant was part of the problem.
+
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
+
+
+# End of transcript or log.
+"""]]
+
+### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
+
+
diff --git a/doc/devblog/day_359__annex.largefiles_gitattributes/comment_1_ac73ad4147629c25cd51d13cfea206cf._comment b/doc/devblog/day_359__annex.largefiles_gitattributes/comment_1_ac73ad4147629c25cd51d13cfea206cf._comment
new file mode 100644
index 000000000..d1732a427
--- /dev/null
+++ b/doc/devblog/day_359__annex.largefiles_gitattributes/comment_1_ac73ad4147629c25cd51d13cfea206cf._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="anarcat"
+ subject="all those parenthesis..."
+ date="2016-02-02T22:56:51Z"
+ content="""
+... is that lisp showing through your haskell sir? :)
+
+jokes aside, it's cool that you can actually do that, i didn't know! is the \"non-space expression\" new too?
+"""]]
diff --git a/doc/forum/Sync_files_from_remote_to_remote/comment_7_77c6550397435e9601fbae467be90976._comment b/doc/forum/Sync_files_from_remote_to_remote/comment_7_77c6550397435e9601fbae467be90976._comment
new file mode 100644
index 000000000..bbacebbdc
--- /dev/null
+++ b/doc/forum/Sync_files_from_remote_to_remote/comment_7_77c6550397435e9601fbae467be90976._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="Jan"
+ subject="comment 7"
+ date="2016-02-03T02:49:01Z"
+ content="""
+I can confirm that Remi's suggestion does work as expected, thanks!
+
+    $ git annex sync --content
+    get 2014/2014-06-14/IMG_1448.JPG (from origin...) (checksum...) ok
+    copy 2014/2014-06-14/IMG_1448.JPG copy 2014/2014-06-14/IMG_1448.JPG (to usb...) ok
+    drop 2014/2014-06-14/IMG_1448.JPG ok
+"""]]
diff --git a/doc/forum/Sync_files_from_remote_to_remote/comment_8_4d3c05acc310a21f6c8ab77fb2638a8c._comment b/doc/forum/Sync_files_from_remote_to_remote/comment_8_4d3c05acc310a21f6c8ab77fb2638a8c._comment
new file mode 100644
index 000000000..279929f2a
--- /dev/null
+++ b/doc/forum/Sync_files_from_remote_to_remote/comment_8_4d3c05acc310a21f6c8ab77fb2638a8c._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="konubinix"
+ subject="git-annex-getcopy.sh"
+ date="2016-02-03T12:32:55Z"
+ content="""
+To do that, I created a simple bash script that get locally the files and then copies them to the remote
+
+https://github.com/Konubinix/Devel/blob/master/bin/git-annex-getcopy.sh
+
+I hope that helps.
+"""]]
diff --git a/doc/todo/wishlist:_global_progress_status/comment_2_816f41f5436543fc09e7d7df82a8c8d5._comment b/doc/todo/wishlist:_global_progress_status/comment_2_816f41f5436543fc09e7d7df82a8c8d5._comment
new file mode 100644
index 000000000..a75aea4c2
--- /dev/null
+++ b/doc/todo/wishlist:_global_progress_status/comment_2_816f41f5436543fc09e7d7df82a8c8d5._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="atrent"
+ subject="adding a simple counter?"
+ date="2016-02-03T07:48:10Z"
+ content="""
+could you add a simple file counter?
+
+i.e. for a single \"git annex copy/get/etc.\" operation initiating a file counter and incrementing it on every examined file (transferred or not), thus giving a very rough idea of the progress on the whole set (the user should know the amount of files in the annex)
+"""]]