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

2 files changed, 48 insertions, 0 deletions

diff --git a/doc/bugs/importfeed_--relaxed_fails_with_HEAD-rejecting_servers.mdwn b/doc/bugs/importfeed_--relaxed_fails_with_HEAD-rejecting_servers.mdwn
new file mode 100644
index 000000000..5a52af36b
--- /dev/null
+++ b/doc/bugs/importfeed_--relaxed_fails_with_HEAD-rejecting_servers.mdwn
@@ -0,0 +1,36 @@
+### Please describe the problem.
+
+Calling "git annex importfeed --relaxed" on a url of a BBC podcast
+fails just like a "git annex addurl --fast" (and not relaxed) on the
+url of a show:
+
+    addurl open.live.bbc.co.uk_mediaselector_5_redir_version_2.0_mediaset_audio_nondrm_download_proto_http_vpid_p02y8kfc.mp3 
+      unable to access url: http://open.live.bbc.co.uk/mediaselector/5/redir/version/2.0/mediaset/audio-nondrm-download/proto/http/vpid/p02y8kfc.mp3
+    failed
+    git-annex: addurl: 1 failed
+
+I suppose that is because HEAD on that same URL returns 403 Forbidden
+(addurl without fast works just fine).
+
+"git annex addurl --relaxed" works on the given url.
+
+
+### What steps will reproduce the problem?
+
+I ran into this bug trying to importfeed various BBC podcasts. For instance:
+
+    $ git annex importfeed --relaxed 'http://www.bbc.co.uk/programmes/p02pc9x6/episodes/downloads.rss'
+    (checking known urls...)
+    importfeed http://www.bbc.co.uk/programmes/p02pc9x6/episodes/downloads.rss 
+    /tmp/feed3947                   100%[=======================================================>]   8,39K  --.-KB/s   en 0,007s 
+    addurl Comedy_of_the_Week/In_and_Out_of_the_Kitchen__Episode_1__The_Supplement.mp3 
+      unable to access url: http://open.live.bbc.co.uk/mediaselector/5/redir/version/2.0/mediaset/audio-nondrm-download/proto/http/vpid/p02yy1hn.mp3
+    failed
+
+      warning: problem downloading item
+    ok
+
+
+### What version of git-annex are you using? On what operating system?
+
+git-annex version: 5.20150731-1 on a quite up-to-date debian unstable.
diff --git a/doc/forum/checkout_view_to_directory_outside_of_annex/comment_3_2139407a3a556023a2458148a4a2c009._comment b/doc/forum/checkout_view_to_directory_outside_of_annex/comment_3_2139407a3a556023a2458148a4a2c009._comment
new file mode 100644
index 000000000..b6e48b4ec
--- /dev/null
+++ b/doc/forum/checkout_view_to_directory_outside_of_annex/comment_3_2139407a3a556023a2458148a4a2c009._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="konubinix"
+ subject="git-new-workdir"
+ date="2015-08-15T12:48:30Z"
+ content="""
+I am not sure whether it would help, but to show views of my git-annex repositories without messing with the current working directory, I generally use git-new-workdir
+https://github.com/git/git/blob/master/contrib/workdir/git-new-workdir
+
+It allows to checkout a separate branch in another directory. The new directory's .git directory contains symbolic links to the parent one, making sure that changes in the new work dir are propagated to the parent one.
+
+Hope that helps.
+"""]]