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

4 files changed, 78 insertions, 0 deletions

diff --git a/doc/bugs/configuration_options_for_system_ssh_and_bundled_ssh_are_incompatible.mdwn b/doc/bugs/configuration_options_for_system_ssh_and_bundled_ssh_are_incompatible.mdwn
new file mode 100644
index 000000000..13f09d964
--- /dev/null
+++ b/doc/bugs/configuration_options_for_system_ssh_and_bundled_ssh_are_incompatible.mdwn
@@ -0,0 +1,53 @@
+### Please describe the problem.
+
+It appears that the bundled ssh is built without support for some configuration options supported by my system ssh. In particular it doesn't support GSSAPIKexAlgorithms. In principle it's fine to compile this ssh without support for GSS, since nobody uses it, but in practice it means that I can't even turn it off in my system config without breaking the bundled ssh.
+
+(I suppose the problem could also be that the bundled ssh tries to use the system ssh configuration instead of a bundled configuration.)
+
+### What version of git-annex are you using? On what operating system?
+
+[[!format sh """
+git-annex version: 6.20161231-gc8eeb17da
+build flags: Assistant Webapp Pairing Testsuite S3(multipartupload)(storageclasses) WebDAV Inotify DBus DesktopNotify ConcurrentOutput TorrentParser MagicMime Feeds Quvi
+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 p2p S3 bup directory rsync web bittorrent webdav tahoe glacier ddar hook external
+local repository version: 6
+supported repository versions: 3 5 6
+upgrade supported from repository versions: 0 1 2 3 4 5
+operating system: linux x86_64
+"""]]
+
+### Please provide any additional information below.
+
+See also [[todo/git-annex_ignores_GIT__95__SSH]]
+
+[[!format sh """
+ db48x  ~  video  git-annex sync
+commit
+On branch master
+Your branch is ahead of 'anglachel/master' by 20 commits.
+  (use "git push" to publish your local commits)
+nothing to commit, working tree clean
+ok
+pull anglachel
+/etc/crypto-policies/back-ends/openssh.config: line 3: Bad configuration option: gssapikexalgorithms
+/etc/crypto-policies/back-ends/openssh.config: terminating, 1 bad configuration options
+fatal: Could not read from remote repository.
+Please make sure you have the correct access rights
+and the repository exists.
+failed
+push anglachel
+/etc/crypto-policies/back-ends/openssh.config: line 3: Bad configuration option: gssapikexalgorithms
+/etc/crypto-policies/back-ends/openssh.config: terminating, 1 bad configuration options
+fatal: Could not read from remote repository.
+Please make sure you have the correct access rights
+and the repository exists.
+  Pushing to anglachel failed.
+  (non-fast-forward problems can be solved by setting receive.denyNonFastforwards to false in the remote's git config)
+failed
+git-annex: sync: 2 failed
+"""]]
+
+### 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/bugs/git_annex_status_fails_with_submodule_in_direct_mode/comment_5_e7c09850009e961354e26f169ccdc6e3._comment b/doc/bugs/git_annex_status_fails_with_submodule_in_direct_mode/comment_5_e7c09850009e961354e26f169ccdc6e3._comment
new file mode 100644
index 000000000..a2af5ca08
--- /dev/null
+++ b/doc/bugs/git_annex_status_fails_with_submodule_in_direct_mode/comment_5_e7c09850009e961354e26f169ccdc6e3._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3"
+ nickname="benjamin.poldrack"
+ avatar="http://cdn.libravatar.org/avatar/5c1a901caa7c2cfeeb7e17e786c5230d"
+ subject="comment 5"
+ date="2017-02-22T16:48:04Z"
+ content="""
+Just noticed another thing: If that failure happens, git-annex exits zero. Therefore it's hard to detect for us. We have just an empty json as return value as if the repo was clean.
+It would be nice to have either a non-zero exit or something within the json to indicate that the command failed.
+
+[[ben]]
+"""]]
diff --git a/doc/forum/Dealing_with_long_filenames.mdwn b/doc/forum/Dealing_with_long_filenames.mdwn
new file mode 100644
index 000000000..5411c3215
--- /dev/null
+++ b/doc/forum/Dealing_with_long_filenames.mdwn
@@ -0,0 +1,8 @@
+- External HD A: annex (contains files with long paths)
+- External HD B: annex (synced with A, doesn't have the contents for files with long paths)
+- laptop HD: annex     (*syncing with B fails*: paths too long)
+
+How should I resolve this? 
+
+- Can I rename the broken symlinks on B to shorten the paths, and then sync to the laptop? Would this be propagated to A when it's connected again?
+- Can I `git rm too/long/paths` on B and then sync?
diff --git a/doc/forum/Upspin.mdwn b/doc/forum/Upspin.mdwn
new file mode 100644
index 000000000..0ef764130
--- /dev/null
+++ b/doc/forum/Upspin.mdwn
@@ -0,0 +1,5 @@
+As soon as I read about Upspin, I thought about git-annex.  Could Upspin's interfaces be beneficial to the project and provide a standardization for naming, permissions and access control?
+
+I realize some of these concepts are not yet part of git-annex, but I thought I'd drop the note and give you the opportunity to evaluate the extent in which Upspin makes sense in the context of git-annex.
+
+https://upspin.io/