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 2019-01-09 14:22:35 -04:00
commit 3f7fe1d325
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
5 changed files with 100 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/bugs/Can__39__t_compile_on_FreeBSD__58___alex__44___StateVar__44___SafeSemaphore__44___IfElse_fail/comment_3_d752f3bae244af1bb06741cfb31d46c2._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="duncan_bayne"
avatar="http://cdn.libravatar.org/avatar/2fc23e2009234ad965f9d5d796400417"
subject="Bug raised"
date="2019-01-08T21:13:38Z"
content="""
I've raised this with the maintainers of the Haskell toolchain on FreeBSD, and will post updates here.
"""]]

8
doc/bugs/Can__39__t_compile_on_FreeBSD__58___alex__44___StateVar__44___SafeSemaphore__44___IfElse_fail/comment_4_7030999ed483c680a80225a26a051b78._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="duncan_bayne"
avatar="http://cdn.libravatar.org/avatar/2fc23e2009234ad965f9d5d796400417"
subject="Known issue"
date="2019-01-09T09:17:20Z"
content="""
This is a known issue, and is being fixed: https://github.com/commercialhaskell/stack/issues/3515
"""]]

150
doc/forum/Cannot_get_file_with_git-annex.mdwn
View file

@ -1,85 +1,95 @@
I recently noticed that a file I thought I had on one of my repositories was missing, so I decided to get it:
chymera@clusterhost ~/ni_data/ofM.dr $ git annex get 20151226_112356_4012_1_7/2/pulseprogram
get 20151226_112356_4012_1_7/2/pulseprogram (from data0...)
git-annex-shell: failed to read git config of git repository in zenhost on /run/media/chymera/data0/ni_data; perhaps this repository is not set up correctly or has moved
rsync: connection unexpectedly closed (0 bytes received so far) [Receiver]
rsync error: error in rsync protocol data stream (code 12) at io.c(226) [Receiver=3.1.3]
chymera@clusterhost ~/ni_data/ofM.dr $ git annex get 20151226_112356_4012_1_7/2/pulseprogram
get 20151226_112356_4012_1_7/2/pulseprogram (from data0...)
git-annex-shell: failed to read git config of git repository in zenhost on /run/media/chymera/data0/ni_data; perhaps this repository is not set up correctly or has moved
rsync: connection unexpectedly closed (0 bytes received so far) [Receiver]
rsync error: error in rsync protocol data stream (code 12) at io.c(226) [Receiver=3.1.3]
rsync failed -- run git annex again to resume file transfer
(from data1...)
git-annex-shell: failed to read git config of git repository in zenhost on /run/media/chymera/data1/ni_data; perhaps this repository is not set up correctly or has moved
rsync: connection unexpectedly closed (0 bytes received so far) [Receiver]
rsync error: error in rsync protocol data stream (code 12) at io.c(226) [Receiver=3.1.3]
rsync failed -- run git annex again to resume file transfer
(from data1...)
git-annex-shell: failed to read git config of git repository in zenhost on /run/media/chymera/data1/ni_data; perhaps this repository is not set up correctly or has moved
rsync: connection unexpectedly closed (0 bytes received so far) [Receiver]
rsync error: error in rsync protocol data stream (code 12) at io.c(226) [Receiver=3.1.3]
rsync failed -- run git annex again to resume file transfer
(from quiethost...)
ssh: connect to host localhost port 2225: Connection refused
rsync: connection unexpectedly closed (0 bytes received so far) [Receiver]
rsync error: unexplained error (code 255) at io.c(226) [Receiver=3.1.3]
rsync failed -- run git annex again to resume file transfer
(from quiethost...)
ssh: connect to host localhost port 2225: Connection refused
rsync: connection unexpectedly closed (0 bytes received so far) [Receiver]
rsync error: unexplained error (code 255) at io.c(226) [Receiver=3.1.3]
rsync failed -- run git annex again to resume file transfer
(from zenhost...)
SHA256E-s32243--feae20d26c487947f9ad30019459464ba5a206a4ae6149a9d10fa4100c64f624
32,243 100% 7.69MB/s 0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
chymera@clusterhost ~/ni_data/ofM.dr $ ls -lah 20151226_112356_4012_1_7/2/pdata/1/
total 468K
drwxr-sr-x 2 chymera wheel 4.0K Nov 2 2017 .
drwxr-sr-x 3 chymera wheel 4.0K Mar 20 2017 ..
-rw-r-Sr-- 1 chymera wheel 422K Mar 20 2017 2dseq
-rw-r-Sr-- 1 chymera wheel 356 Mar 20 2017 id
-rw-r-Sr-- 1 chymera wheel 420 Mar 20 2017 methreco
-rw-r-Sr-- 1 chymera wheel 349 Mar 20 2017 procs
-rw-r-Sr-- 1 chymera wheel 9.1K Mar 20 2017 reco
-rw-r-Sr-- 1 chymera wheel 8.3K Nov 2 2017 visu_pars
chymera@clusterhost ~/ni_data/ofM.dr $ ls -lah 20151226_112356_4012_1_7/2/pulseprogram
lrwxrwxrwx 1 chymera wheel 195 Dec 25 22:01 20151226_112356_4012_1_7/2/pulseprogram -> ../../../.git/annex/objects/vz/WW/SHA256E-s32243--feae20d26c487947f9ad30019459464ba5a206a4ae6149a9d10fa4100c64f624/SHA256E-s32243--feae20d26c487947f9ad30019459464ba5a206a4ae6149a9d10fa4100c64f624
chymera@clusterhost ~/ni_data/ofM.dr $ git annex get 20151226_112356_4012_1_7/2/pulseprogram
chymera@clusterhost ~/ni_data/ofM.dr $ ls -lah 20151226_112356_4012_1_7/2/pdata/1/^C
chymera@clusterhost ~/ni_data/ofM.dr $ git annex direct
chymera@clusterhost ~/ni_data/ofM.dr $ git annex get 20151226_112356_4012_1_7/2/pulseprogram
chymera@clusterhost ~/ni_data/ofM.dr $ ls -lah 20151226_112356_4012_1_7/2/pulseprogram
lrwxrwxrwx 1 chymera wheel 195 Dec 25 22:01 20151226_112356_4012_1_7/2/pulseprogram -> ../../../.git/annex/objects/vz/WW/SHA256E-s32243--feae20d26c487947f9ad30019459464ba5a206a4ae6149a9d10fa4100c64f624/SHA256E-s32243--feae20d26c487947f9ad30019459464ba5a206a4ae6149a9d10fa4100c64f624
chymera@clusterhost ~/ni_data/ofM.dr $ git annex drop 20151226_112356_4012_1_7/2/pulseprogram
drop 20151226_112356_4012_1_7/2/pulseprogram (locking data0...) (lockcontent failed) (checking data0...) git-annex-shell: failed to read git config of git repository in zenhost on /run/media/chymera/data0/ni_data; perhaps this repository is not set up correctly or has moved
(locking data1...) (lockcontent failed) (checking data1...) git-annex-shell: failed to read git config of git repository in zenhost on /run/media/chymera/data1/ni_data; perhaps this repository is not set up correctly or has moved
(locking quiethost...) (lockcontent failed) (checking quiethost...) ssh: connect to host localhost port 2225: Connection refused
(locking zenhost...) ok
(recording state in git...)
chymera@clusterhost ~/ni_data/ofM.dr $ git annex get 20151226_112356_4012_1_7/2/pulseprogram
get 20151226_112356_4012_1_7/2/pulseprogram (from data0...)
git-annex-shell: failed to read git config of git repository in zenhost on /run/media/chymera/data0/ni_data; perhaps this repository is not set up correctly or has moved
rsync: connection unexpectedly closed (0 bytes received so far) [Receiver]
rsync error: error in rsync protocol data stream (code 12) at io.c(226) [Receiver=3.1.3]
rsync failed -- run git annex again to resume file transfer
(from zenhost...)
SHA256E-s32243--feae20d26c487947f9ad30019459464ba5a206a4ae6149a9d10fa4100c64f624
32,243 100% 7.69MB/s 0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
rsync failed -- run git annex again to resume file transfer
(from data1...)
git-annex-shell: failed to read git config of git repository in zenhost on /run/media/chymera/data1/ni_data; perhaps this repository is not set up correctly or has moved
rsync: connection unexpectedly closed (0 bytes received so far) [Receiver]
rsync error: error in rsync protocol data stream (code 12) at io.c(226) [Receiver=3.1.3]
rsync failed -- run git annex again to resume file transfer
(from quiethost...)
ssh: connect to host localhost port 2225: Connection refused
rsync: connection unexpectedly closed (0 bytes received so far) [Receiver]
rsync error: unexplained error (code 255) at io.c(226) [Receiver=3.1.3]
chymera@clusterhost ~/ni_data/ofM.dr $ ls -lah 20151226_112356_4012_1_7/2/pdata/1/
total 468K
drwxr-sr-x 2 chymera wheel 4.0K Nov 2 2017 .
drwxr-sr-x 3 chymera wheel 4.0K Mar 20 2017 ..
-rw-r-Sr-- 1 chymera wheel 422K Mar 20 2017 2dseq
-rw-r-Sr-- 1 chymera wheel 356 Mar 20 2017 id
-rw-r-Sr-- 1 chymera wheel 420 Mar 20 2017 methreco
-rw-r-Sr-- 1 chymera wheel 349 Mar 20 2017 procs
-rw-r-Sr-- 1 chymera wheel 9.1K Mar 20 2017 reco
-rw-r-Sr-- 1 chymera wheel 8.3K Nov 2 2017 visu_pars
rsync failed -- run git annex again to resume file transfer
(from zenhost...)
SHA256E-s32243--feae20d26c487947f9ad30019459464ba5a206a4ae6149a9d10fa4100c64f624
32,243 100% 30.75MB/s 0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
chymera@clusterhost ~/ni_data/ofM.dr $ ls -lah 20151226_112356_4012_1_7/2/pulseprogram
lrwxrwxrwx 1 chymera wheel 195 Dec 25 22:01 20151226_112356_4012_1_7/2/pulseprogram -> ../../../.git/annex/objects/vz/WW/SHA256E-s32243--feae20d26c487947f9ad30019459464ba5a206a4ae6149a9d10fa4100c64f624/SHA256E-s32243--feae20d26c487947f9ad30019459464ba5a206a4ae6149a9d10fa4100c64f624
chymera@clusterhost ~/ni_data/ofM.dr $ ls -lah 20151226_112356_4012_1_7/2/pulseprogram
lrwxrwxrwx 1 chymera wheel 195 Dec 25 22:01 20151226_112356_4012_1_7/2/pulseprogram -> ../../../.git/annex/objects/vz/WW/SHA256E-s32243--feae20d26c487947f9ad30019459464ba5a206a4ae6149a9d10fa4100c64f624/SHA256E-s32243--feae20d26c487947f9ad30019459464ba5a206a4ae6149a9d10fa4100c64f624
chymera@clusterhost ~/ni_data/ofM.dr $ git annex get 20151226_112356_4012_1_7/2/pulseprogram
chymera@clusterhost ~/ni_data/ofM.dr $ ls -lah 20151226_112356_4012_1_7/2/pdata/1/^C
chymera@clusterhost ~/ni_data/ofM.dr $ git annex direct
chymera@clusterhost ~/ni_data/ofM.dr $ git annex get 20151226_112356_4012_1_7/2/pulseprogram
chymera@clusterhost ~/ni_data/ofM.dr $ ls -lah 20151226_112356_4012_1_7/2/pulseprogram
lrwxrwxrwx 1 chymera wheel 195 Dec 25 22:01 20151226_112356_4012_1_7/2/pulseprogram -> ../../../.git/annex/objects/vz/WW/SHA256E-s32243--feae20d26c487947f9ad30019459464ba5a206a4ae6149a9d10fa4100c64f624/SHA256E-s32243--feae20d26c487947f9ad30019459464ba5a206a4ae6149a9d10fa4100c64f624
chymera@clusterhost ~/ni_data/ofM.dr $ git annex drop 20151226_112356_4012_1_7/2/pulseprogram
drop 20151226_112356_4012_1_7/2/pulseprogram (locking data0...) (lockcontent failed) (checking data0...) git-annex-shell: failed to read git config of git repository in zenhost on /run/media/chymera/data0/ni_data; perhaps this repository is not set up correctly or has moved
(locking data1...) (lockcontent failed) (checking data1...) git-annex-shell: failed to read git config of git repository in zenhost on /run/media/chymera/data1/ni_data; perhaps this repository is not set up correctly or has moved
(locking quiethost...) (lockcontent failed) (checking quiethost...) ssh: connect to host localhost port 2225: Connection refused
(locking zenhost...) ok
(recording state in git...)
chymera@clusterhost ~/ni_data/ofM.dr $ git annex get 20151226_112356_4012_1_7/2/pulseprogram
get 20151226_112356_4012_1_7/2/pulseprogram (from data0...)
git-annex-shell: failed to read git config of git repository in zenhost on /run/media/chymera/data0/ni_data; perhaps this repository is not set up correctly or has moved
rsync: connection unexpectedly closed (0 bytes received so far) [Receiver]
rsync error: error in rsync protocol data stream (code 12) at io.c(226) [Receiver=3.1.3]
rsync failed -- run git annex again to resume file transfer
(from data1...)
git-annex-shell: failed to read git config of git repository in zenhost on /run/media/chymera/data1/ni_data; perhaps this repository is not set up correctly or has moved
rsync: connection unexpectedly closed (0 bytes received so far) [Receiver]
rsync error: error in rsync protocol data stream (code 12) at io.c(226) [Receiver=3.1.3]
rsync failed -- run git annex again to resume file transfer
(from quiethost...)
ssh: connect to host localhost port 2225: Connection refused
rsync: connection unexpectedly closed (0 bytes received so far) [Receiver]
rsync error: unexplained error (code 255) at io.c(226) [Receiver=3.1.3]
rsync failed -- run git annex again to resume file transfer
(from zenhost...)
SHA256E-s32243--feae20d26c487947f9ad30019459464ba5a206a4ae6149a9d10fa4100c64f624
32,243 100% 30.75MB/s 0:00:00 (xfr#1, to-chk=0/1)
(checksum...) ok
(recording state in git...)
chymera@clusterhost ~/ni_data/ofM.dr $ ls -lah 20151226_112356_4012_1_7/2/pulseprogram
lrwxrwxrwx 1 chymera wheel 195 Dec 25 22:01 20151226_112356_4012_1_7/2/pulseprogram -> ../../../.git/annex/objects/vz/WW/SHA256E-s32243--feae20d26c487947f9ad30019459464ba5a206a4ae6149a9d10fa4100c64f624/SHA256E-s32243--feae20d26c487947f9ad30019459464ba5a206a4ae6149a9d10fa4100c64f624
Even after git-annex states it fetched it, the symlink is still broken.
On my other remote, however, it's perfectly fine:
chymera@zenhost ~/ni_data/ofM.dr $ ls -lah 20151226_112356_4012_1_7/2/pulseprogram
lrwxrwxrwx 1 chymera wheel 195 May 23 2018 20151226_112356_4012_1_7/2/pulseprogram -> ../../../.git/annex/objects/vz/WW/SHA256E-s32243--feae20d26c487947f9ad30019459464ba5a206a4ae6149a9d10fa4100c64f624/SHA256E-s32243--feae20d26c487947f9ad30019459464ba5a206a4ae6149a9d10fa4100c64f624
chymera@zenhost ~/ni_data/ofM.dr $ ls -lah 20151226_112356_4012_1_7/2/pulseprogram
lrwxrwxrwx 1 chymera wheel 195 May 23 2018 20151226_112356_4012_1_7/2/pulseprogram -> ../../../.git/annex/objects/vz/WW/SHA256E-s32243--feae20d26c487947f9ad30019459464ba5a206a4ae6149a9d10fa4100c64f624/SHA256E-s32243--feae20d26c487947f9ad30019459464ba5a206a4ae6149a9d10fa4100c64f624

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

@ -0,0 +1 @@
Is it correct that whenever the documentation refers to a "remote", the "here" remote can be specified to denote the local annex?

3
doc/todo/MD5E_keys_without_file_size.mdwn Normal file
View file

@ -0,0 +1,3 @@
Would it be hard to support MD5E keys that omit the -sSIZE part, the way this is allowed for URL keys? I have a use case where I have the MD5 hashes and filenames of files stored in the cloud, but not their sizes, and want to construct keys for these files to use with setpresentkey and registerurl. I could construct URL keys, but then I lose the error-checking and have to set annex.security.allow-unverified-downloads . Or maybe, extend URL keys to permit an -hMD5 hash to be part of the key?
Another (and more generally useful) solution would be [[todo/alternate_keys_for_same_content/]]. Then can start with a URL-based key but then attach an MD5 to it as metadata, and have the key treated as a checksum-containing key, without needing to migrate the contents to a new key.