mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source
This commit is contained in:
Joey Hess 2013-01-26 20:10:06 +11:00
commit 42303499db
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/forum/recovering_from_repo_corruption/comment_2_3bd1c0bf25a0e892e711a60f53cd5298._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawmRFKwny4rArBaz-36xTcsJYqKIgdDaw5Q"
nickname="Andrew"
subject="comment 2"
date="2013-01-26T08:13:34Z"
content="""
Oh! Good call. That worked, though I did have to sync and revert alternately a few times to get things resolved. I still haven't figured out what exactly happened, though. In two separate instances, the commit message was \"git-annex automatic sync\"
"""]]

14
doc/todo/wishlist:_addurl_https:/comment_1_4e8f5e1fc52c3000eb2a1dad0624906e._comment Normal file
View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="2001:4978:f:21a::2"
subject="comment 1"
date="2013-01-26T08:44:38Z"
content="""
This works fine with \"git annex addurl\".
However, with --fast, it fails:
git-annex: user error (https not supported)
This is because the Haskell HTTP library doesn't support https yet. <https://github.com/haskell/HTTP/issues/17> Seems to be very little momentum on fixing that, perhaps I need to switch the code to use http-enumerator, which does.
"""]]