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 2015-07-15 10:57:11 -04:00
commit e83850344d
3 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
doc/forum/importfeed_does_not_work_with_youtube_anymore.mdwn Normal file
View file

@ -0,0 +1 @@
Did youtube change their api? My youtube feeds doesn't work anymore. No problems with other sites.

8
doc/install/verifying_downloads/comment_1_c216c2d7d42cc578caff815eba85f448._comment
View file

@ -1,8 +0,0 @@
[[!comment format=mdwn
username="04448cae@7f89c9ec07b399265c20ea79b979d2afa5f75fa8"
nickname="04448cae"
subject="GPG Key"
date="2015-07-12T03:23:07Z"
content="""
According to https://git-annex.branchable.com/install/verifying_downloads/ we should expect GPG key, C910D9222512E3C7 Joey Hess <id@joeyh.name> for this Windows installer file, but git-annex-installer.exe returns \"Signed on 2015-07-10 14:56 by id@joeyh.name (Key ID: 0x89C809CB). The validity of the signature cannot be verified.\" That key is on the keyserver http://pgp.surfnet.nl:11371/pks/lookup?op=vindex&fingerprint=on&search=0x89C809CB but doesn't match the verify page. Is this file legit, or the page in need of update? Thanks!
"""]]

13
doc/todo/transfer_between_git-annexes/comment_2_2a494355a114a3df7ff0b35aa12ed10d._comment Normal file
View file

@ -0,0 +1,13 @@
[[!comment format=mdwn
username="CandyAngel"
subject="comment 2"
date="2015-07-15T10:20:55Z"
content="""
Been thinking about this as I am getting close to needing it, but would like some advice.
My current plan is to copy the symlink to the target annex, add it to the index (fix it?), copy the source file from $source/.git/annex/objects to $target/.git/annex/tmp, then use 'reinject $target/.git/annex/tmp/$keyed_file $path_to_symlink'.
As far as I can tell, this is safest way (uses mostly git-annex) to transfer a file between annexes. However, when transferring a directory of files, this will end up with 1 commit per file on the git-annex branch, which may be a problem.
Is there any easy way to make this \"atomic\", so that git-annex will only get a commit if everything went okay and if not, revert any changes to $target? Am I looking at 'git stash', recording the master/git-annex references before the move and resetting to them in case of an error or rebasing(fixup) git-annex on success?
"""]]