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

8 files changed, 151 insertions, 0 deletions

diff --git a/doc/bugs/Interrupted_command_broke_encfs_repository.mdwn b/doc/bugs/Interrupted_command_broke_encfs_repository.mdwn
new file mode 100644
index 000000000..38bb06023
--- /dev/null
+++ b/doc/bugs/Interrupted_command_broke_encfs_repository.mdwn
@@ -0,0 +1,54 @@
+### Please describe the problem.
+
+I use git annex on my phone on an encfs directory on a debian root put on a sdcard.
+
+After an interruption, it may happens that git-annex (or git?) changes the
+content of a file in the .git directory by a content in a file from the working
+directory.
+
+[[!format sh """
+$ cat .git/config
+../../../.git/annex/objects/f8/gZ/SHA256E-s1455016--03aaa9bcccada56b6615d9e333b8ada2dd6d1fb14c4aacfac87271939377f537.JPG/SHA256E-s1455016--03aaa9bcccada56b6615d9e333b8ada2dd6d1fb14c4aacfac87271939377f537.JPG
+$ cat .git/refs/remotes/master
+../../../../.git/annex/objects/29/wQ/SHA256E-s2533743--ec986bdbe37257bb5a940469d1e1b64a6016902736ed87315bab5856de322f42.JPG/SHA256E-s2533743--ec986bdbe37257bb5a940469d1e1b64a6016902736ed87315bab5856de322f42.JPG
+"""]]
+
+I only experienced this behavior two or three times since I have been using git-annex (3 years ago).
+
+Everything else works fine and fsck indicates no problem with the sdcard.
+
+This is a strange behavior that is a pain to solve, but today, I experienced something
+even stranger.
+
+Instead of writing the content into the .git/ directory. It was put in the encoded file in the crypt directory, with the path correctly encoded.
+
+[[!format sh """
+$ cat repo/.git/config
+cat: repo/.git/config: Input/output error
+$ encfsctl encode crypt_repo/ .git/config
+CqJBnbpfTEgKPAnmc8Sbo/IA-gS5lOzCF65DW9C7l-3MYU/OKritNqY4ewLnzQ,R2dtBXzW
+$ cat crypt_repo/CqJBnbpfTEgKPAnmc8Sbo/IA-gS5lOzCF65DW9C7l-3MYU/OKritNqY4ewLnzQ,R2dtBXzW
+../../../RSYdwqZh7kgnn3RSbEEx86ax/60jj4hZ60tqcDwSiXy-hHpD9/ebwg,0lJ7hi2iBbgF7HBfdqC/-muvnOVFmMIkfUtJAVyMGRUs/lRm4UHX0Dj2lW6IsCnnBBBSX/O9l1191uPE0a2D-FXhrOEG5,uWeGZHyJccAsw64vy16H3iTcRrxY-75YdRnnMzL27zpC5j0UUVnTaU0TBg0ze-xWCLpoJHZha48Uu8NaekYpn9C5QSSmUV08aZERdCdCfS3/GSOJ0Txna5LM9CLDD6Pw8x5pZ7D5YKFdNb-yx4APrKVm,EXauZiDQoXo6qOuVCMUI4KJB9kdnprlZ4Bw7h7w2jogW7Q1GDpqKVSgk7VYLuk5D7CpdaslquWbg0Ci5e9k9T7
+$ encfs decode ../../../RSYdwqZh7kgnn3RSbEEx86ax/60jj4hZ60tqcDwSiXy-hHpD9/ebwg,0lJ7hi2iBbgF7HBfdqC/-muvnOVFmMIkfUtJAVyMGRUs/lRm4UHX0Dj2lW6IsCnnBBBSX/O9l1191uPE0a2D-FXhrOEG5,uWeGZHyJccAsw64vy16H3iTcRrxY-75YdRnnMzL27zpC5j0UUVnTaU0TBg0ze-xWCLpoJHZha48Uu8NaekYpn9C5QSSmUV08aZERdCdCfS3/GSOJ0
+../../../.git/annex/objects/f8/gZ/SHA256E-s1455016--03aaa9bcccada56b6615d9e333b8ada2dd6d1fb14c4aacfac87271939377f537.JPG/SHA256E-s1455016--03aaa9bcccada56b6615d9e333b8ada2dd6d1fb14c4aacfac87271939377f537.JPG
+"""]]
+
+### What steps will reproduce the problem?
+Interruption of a git annex command, I guess an add or an import command.
+
+### What version of git-annex are you using? On what operating system?
+
+Android 4.3 Cyanogenmod/Samsung Galaxy S3, chrooted debian.
+
+[[!format sh """
+$ git annex version
+git-annex version: 5.20141125
+build flags: Assistant Pairing Testsuite S3 Inotify DBus DesktopNotify XMPP DNS Feeds Quvi TDFA CryptoHash
+key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
+remote types: git gcrypt S3 bup directory rsync web tahoe glacier ddar hook external
+$ cat /etc/debian_version
+8.0
+"""]]
+
+### Please provide any additional information below.
+If you ask for additional information, I will gladly provide it.
diff --git a/doc/bugs/kill_git-annex_assistant_on_logout.mdwn b/doc/bugs/kill_git-annex_assistant_on_logout.mdwn
new file mode 100644
index 000000000..0640a5aaf
--- /dev/null
+++ b/doc/bugs/kill_git-annex_assistant_on_logout.mdwn
@@ -0,0 +1,3 @@
+When you logout of any x session git-annex does not get killed.
+This means that if you login again git-annex will still try to use the ssh-agent from the last session which doesn't run anymore.
+This leads to countless password queries unless you use a passwordless key.
diff --git a/doc/forum/How_big_can_a_git-annex_repo_get_and_still_be_reliable_and_fast__63__.mdwn b/doc/forum/How_big_can_a_git-annex_repo_get_and_still_be_reliable_and_fast__63__.mdwn
new file mode 100644
index 000000000..1349ad95e
--- /dev/null
+++ b/doc/forum/How_big_can_a_git-annex_repo_get_and_still_be_reliable_and_fast__63__.mdwn
@@ -0,0 +1,8 @@
+As title says, how big can a git-annex repo be?
+
+My use case is this:
+I have a few external hard disks (like 2TB, 3TB etc) and each of them have a bunch of files. Ideally I would like to keep all of the data organized in a _single_ git annex repo. However, there are probably a handful of really big files and a LARGE number of really small files, and I doubt its a good idea to put all of them in together.
+
+What should be my biggest concern? I assume file size is not a problem, and I should either tar/zip smaller files into much bigger ones and annex that, or split it up into multiple small annex repositories.
+
+Any suggestions? What do the rest of you with similar amounts of data do?
diff --git a/doc/forum/How_big_can_a_git-annex_repo_get_and_still_be_reliable_and_fast__63__/comment_1_99e7e1b178bbb17fffea0892538d4049._comment b/doc/forum/How_big_can_a_git-annex_repo_get_and_still_be_reliable_and_fast__63__/comment_1_99e7e1b178bbb17fffea0892538d4049._comment
new file mode 100644
index 000000000..84252ba5b
--- /dev/null
+++ b/doc/forum/How_big_can_a_git-annex_repo_get_and_still_be_reliable_and_fast__63__/comment_1_99e7e1b178bbb17fffea0892538d4049._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="CandyAngel"
+ subject="comment 1"
+ date="2015-06-30T07:17:48Z"
+ content="""
+It can actually get really big and still be okay to use, if you follow the [tips page for annexs with lots of files](/tips/Repositories with large number of files).
+
+Mine is still reasonably responsive at 10 million files! Iterating over it all (git annex info, deduping) is really painful though, but it'd be like that without git-annex..
+"""]]
diff --git a/doc/forum/Restoring_files__63__.mdwn b/doc/forum/Restoring_files__63__.mdwn
new file mode 100644
index 000000000..d0bf86d90
--- /dev/null
+++ b/doc/forum/Restoring_files__63__.mdwn
@@ -0,0 +1,11 @@
+One of my users created a git annex repository a while ago and has since left the lab, and I think they messed it up badly.
+
+It looks like all of the data is present in the annex directory, but there are no files in main directory, other than the .git folder. The master branch seems to be gone, and the only branch left is called git-annex.
+
+git log gives the error "fatal: bad default revision 'HEAD'" when I first do git log, because the branch that I am on doesn't exist (the master branch). Changing to the git-annex branch works, but then I can't go back to the master branch because it doesn't exist.
+
+git annex unannex doesn't seem to do anything. Is there any way to get the data back following this kind of mess up?
+
+Thanks for your help
+
+-Mike
diff --git a/doc/forum/Restoring_files__63__/comment_1_735b98419b3ba6207cc364426b03ce74._comment b/doc/forum/Restoring_files__63__/comment_1_735b98419b3ba6207cc364426b03ce74._comment
new file mode 100644
index 000000000..81cf3612b
--- /dev/null
+++ b/doc/forum/Restoring_files__63__/comment_1_735b98419b3ba6207cc364426b03ce74._comment
@@ -0,0 +1,40 @@
+[[!comment format=mdwn
+ username="Chel"
+ subject="comment 1"
+ date="2015-06-30T06:32:59Z"
+ content="""
+If there are no branches, other than git-annex, then you do not have git history.
+
+If it is really the old repository with deleted branches and not a newly created
+one, then there is a possibility, that the git history has not been fully
+deleted/garbage-collected yet (i.e. there are old objects and packs in
+`.git/objects` and `.git/objects/pack`). It that case:
+
+1. *Do not run* git commands until you create a backup of the .git directory,
+   because some usual git commands automatically launch `git gc --auto`, which
+   removes some old unreachable objects (and maybe reflog entries).
+
+2. See if there are some reflogs of deleted branches or HEAD left in `.git/logs`.
+   Reflogs will give you commit ids that branches’ tips pointed to. But usually
+   reflogs are deleted with their branches.
+
+3. As the last resort, use `git fsck --dangling` to find objects, that may be
+   the commits of deleted branches. See also other options of `git fsck` command.
+
+Of course, all that is not necessary if you have a clone of the repo somewhere.
+Then just fetch the history from it.
+
+Git history will give you the history of modifications in the repository, the
+content of not annexed files (that were stored directly in git) and the names
+of annexed files (represented as symlinks).
+
+If all you need is just the contents of annexed files, then look at
+`.git/annex/objects`.  
+**But**: if the repository was in direct mode, then `.git/annex/objects` *may*
+contain only *old* versions of files. The current versions of annexed files
+in direct mode are stored in the working directory, which is empty in your case.
+
+The git-annex branch contains just the location log of the content of annexed
+files, i.e. which git-annex repositories and when stored the contents.
+
+"""]]
diff --git a/doc/forum/Trouble_adding_ssh_remote_using_assistant_on_windows.mdwn b/doc/forum/Trouble_adding_ssh_remote_using_assistant_on_windows.mdwn
new file mode 100644
index 000000000..08da616a8
--- /dev/null
+++ b/doc/forum/Trouble_adding_ssh_remote_using_assistant_on_windows.mdwn
@@ -0,0 +1,19 @@
+Hi, just trying to set up git-annex-assistant on freshly installed windows 10. I've run the web app and created a local repo. I also grabbed the tarball on my server and ran "git-annex" with no arguments (?). I'm now trying to add remote server using ssh. I add the correct details and click "Check this server", at which point it displays "Testing Server, Checking ssh connection to the server. This could take a minute". indefinitely.
+
+I've checked the log and don't see any ssh errors, but I do see some weirdness:
+
+```
+(scanning...) [2015-06-29 19:02:36 GMT Summer Time] Watcher: Performing startup scan
+(started...) rerrrrrrceereeeevccecccc:vvcvvvv ::v::::f  :    aff ffffiaafaaaaliiaiiiiellilllldeeleeee ddedddd(  d    N(( ((((oNN(NNNN ooNooooe  o    ree eeeerrrerrrrorrrrrrrrooroooo)rrorrrr
+))r))))
+
+)
+
+rerrrceeevccc:vvv :::f   afffiaaaliiiellldeee ddd(   N(((oNNN oooe   reeerrrrorrrrooo)rrr
+)))
+
+rerrrrrrrrrrrrrceeeeeeeeeeeeevccccccccccccc:vvvvvvvvvvvvv :::::::::::::f             afffffffffffffiaaaaaaaaaaaaaliiiiiiiiiiiiiellllllllllllldeeeeeeeeeeeee ddddddddddddd(             N(((((((((((((oNNNNNNNNNNNNN oooooooooooooe             reeeeeeeeeeeeerrrrrrrrrrrrrrorrrrrrrrrrrrrrooooooooooooo)rrrrrrrrrrrrr
+)))))))))))))
+```
+
+Not sure what that is but it might be relevant? Any help would be appreciated.
diff --git a/doc/forum/s3_special_remote_does_not_resume_uploads_even_with_new_chunking/comment_3_85989f505931ec695d7f3de74db0f5a1._comment b/doc/forum/s3_special_remote_does_not_resume_uploads_even_with_new_chunking/comment_3_85989f505931ec695d7f3de74db0f5a1._comment
new file mode 100644
index 000000000..aac24a023
--- /dev/null
+++ b/doc/forum/s3_special_remote_does_not_resume_uploads_even_with_new_chunking/comment_3_85989f505931ec695d7f3de74db0f5a1._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="digiuser"
+ subject="any updates?"
+ date="2015-06-29T03:05:53Z"
+ content="""
+Sorry to post again here but I was wondering if this message got lost. Anyone have a solution here? Thanks!
+"""]]