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 2018-10-29 16:01:46 -04:00
commit d73f92d8bc
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 41 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
doc/bugs/__34__content_is_locked__34___with_git-annex-drop_-J48/comment_2_b0ab844bd2714ae19d8cb45550e50249._comment Normal file
View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="Ilya_Shlyakhter"
avatar="http://cdn.libravatar.org/avatar/1647044369aa7747829c38b9dcc84df0"
subject="comment 2"
date="2018-10-29T19:48:36Z"
content="""
annex.pidlock is not set in the config file. \"Do you see git-annex displaying multiple concurrent actions at the same time?\" -- displaying where? I was just looking at 'top'.
There are some keys to which multiple git-annex symlink point.
"""]]

26
doc/bugs/git-annex-migrate_fails.mdwn Normal file
View file

@ -0,0 +1,26 @@
Migrating from a URL key to an MD5E key (after addurl --fast using an external special remote) fails:
(master_env_py27_v28) [03:15 PM /data/ilya-work]$ git annex --verbose --debug migrate A4.taxfilt.bam
[2018-10-29 15:15:55.197015] read: git ["--git-dir=.git","--work-tree=.","--literal-pathspecs","ls-files","--cached","-z","--","A4.taxfilt.bam"]
[2018-10-29 15:15:55.232756] chat: git ["--git-dir=.git","--work-tree=.","--literal-pathspecs","check-attr","-z","--stdin","annex.backend","annex.numcopies","annex.largefiles","--"]
[2018-10-29 15:15:55.232934] read: git ["--version"]
[2018-10-29 15:15:55.233841] process done ExitSuccess
migrate A4.taxfilt.bam failed
[2018-10-29 15:15:55.263931] process done ExitSuccess
git-annex: migrate: 1 failed
(master_env_py27_v28) [03:15 PM /data/ilya-work]$ git annex info A4.taxfilt.bam
file: A4.taxfilt.bam
size: 12.75 megabytes
key: URL-s12750247--dx://file-FJZjKx800YQPJ5j589Q2Kfzv/A4.taxfilt.bam
present: true
(master_env_py27_v28) [03:16 PM /data/ilya-work]$ git annex whereis A4.taxfilt.bam
whereis A4.taxfilt.bam (2 copies)
0928dfcc-4dbe-4c24-a5a0-ac05c4a2c829 -- ilyas_main_repo [here]
6803648c-87e6-41ef-9570-48adb13ff59a -- [mydx]
mydx: dx://file-FJZjKx800YQPJ5j589Q2Kfzv/A4.taxfilt.bam
ok
(master_env_py27_v28) [03:16 PM /data/ilya-work]$ git annex --verbose --debug migrate A4.taxfilt.bam --backend MD5E
[2018-10-29 15:17:15.621264] read: git ["--git-dir=.git","--work-tree=.","--literal-pathspecs","ls-files","--cached","-z","--","A4.taxfilt.bam"]
migrate A4.taxfilt.bam failed
git-annex: migrate: 1 failed

6
doc/todo/alternate_keys_for_same_content.mdwn Normal file
View file

@ -0,0 +1,6 @@
Designate a metadata field, say alt_keys, to store alternate keys for the content designated by the key with the metadata.
Then, after initially adding a URL key, and after some time getting its content, a checksum-based key such as MD5 could be added as the URL key's metadata.
Then, without needing to migrate, the URL key could be treated like checksum-based keys, e.g. downloaded from untrusted remotes, fsck'ed, etc.
The problem with migrating keys is that a separate copy of the contents is stored in the annex under the old key; but it you force-drop that, symlinks in
older commits will become invalid. You could rewrite git history, but that brings its own problems.