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

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

Browse source
This commit is contained in:
Joey Hess 2014-04-15 20:14:23 -04:00
commit ca1eb5f505
3 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/design/assistant/polls/prioritizing_special_remotes.mdwn
View file

@ -6,7 +6,7 @@ locally paired systems, and remote servers with rsync.
Help me prioritize my work: What special remote would you most like
to use with the git-annex assistant?
[[!poll open=yes 16 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 9 "Box.com (done)" 71 "My phone (or MP3 player)" 25 "Tahoe-LAFS" 10 "OpenStack SWIFT" 33 "Google Drive"]]
[[!poll open=yes 16 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 9 "Box.com (done)" 72 "My phone (or MP3 player)" 25 "Tahoe-LAFS" 10 "OpenStack SWIFT" 33 "Google Drive"]]
This poll is ordered with the options I consider easiest to build
listed first. Mostly because git-annex already supports them and they

10
doc/forum/Corrupt_Repository_Invalid_Object.mdwn Normal file
View file

@ -0,0 +1,10 @@
One of my repositories got corrupted. I am not exactly sure how it happened (was running a series of commands) but I think I accidentally ran regular mv instead of git mv. To fix it I deleted the moved file then checkout the original link however this did not fixed the problem. I ended up with a corrupted repo. Now running any command ends with the following error,
ga sync
(merging origin/git-annex origin/synced/git-annex into git-annex...)
(Recording state in git...)
error: invalid object 040000 6ad564920e3d78d31c9456f5be3869a0319f9f08 for'3fd/d44'
fatal: git-write-tree: error building trees
git-annex: failed to read sha from git write-tree
Was wondering how to fix this? I did run git fsck and git annex fsck but non fixed the problem.

8
doc/tips/using_Amazon_S3/comment_3_32acba030c2ad252e2f7027075e4303e._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="annexuser"
ip="64.71.7.82"
subject="Altering AWS credentials"
date="2014-04-15T21:59:43Z"
content="""
If I revoke old AWS credentials and create new ones, how would I inform git-annex of the change to `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY`?
"""]]