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-07-27 20:56:19 -04:00
commit 55bd5a81ad
19 changed files with 204 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
doc/bugs/Internal_Server_Error:_Unknown_UUID/comment_3_bda72b0d615843d18d6ef21f833432a8._comment Normal file
View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.246.110"
subject="I can't reproduce this problem, but I see several people have reported it."
date="2013-07-27T22:11:15Z"
content="""
It would be helpful for anyone who can reproduce this problem to do so with debugging enabled on both sides
(run with --debug or turn it on in the Configuration page in webapp), and then send the `.git/annex/daemon.log`
"""]]

10
doc/bugs/Local_network___40__ssh__41___fails_to_pair__47__sync/comment_2_104898dce3c67c082a9f2b36e2f45ff8._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.246.110"
subject="comment 2"
date="2013-07-28T00:27:23Z"
content="""
Remote mythbuntuserver.local_annex does not have git-annex installed; setting remote.mythbuntuserver.local_annex.annex-ignore
So, how did you install git-annex on mythbuntuserver? What does the `.ssh/authorized_keys` on mythbuntuserver look like? (In particular the key that git-annex adds to it, which should be set to run git-annex-shell.)
"""]]

10
doc/bugs/Resource_exhausted/comment_4_1e9b74e60da57c3d5f08c1eb3801c1d2._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.246.110"
subject="comment 4"
date="2013-07-28T00:23:08Z"
content="""
Hmm, Adam your version is older than the bug reporter's version. OTOH, while there were several FD leak fixes after your version, none of them were to Annex.LockPool, which is what's used for the ssh lock files.
I can't reproduce it with `git annex get` and the current release.. can you?
"""]]

17
doc/bugs/failure_to_find_file_that___34__should__34___exist_in_remote_is_silent/comment_3_74fc0e41a6bd5c4d8c4b2f15e5ed8d2f._comment Normal file
View file

@ -0,0 +1,17 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.246.110"
subject="comment 3"
date="2013-07-27T22:39:12Z"
content="""
The --from is the missing piece to reproduce:
[[!format sh \"\"\"
joey@gnu:~/tmp/old/mydir2>git annex get disk2 --from origin
joey@gnu:~/tmp/old/mydir2>
\"\"\"]]
What's going on here is that `get --from` is essentially an alias to `copy --from`, and that skips copying files that it knows are not present on the remote. Since the remote is a local directory, it's inexpensive for it to check if the file is really there, rather than relying on the location log.
This seems suboptimal, but I'm not sure which part of the behavior it makes sense to change. It seems nice for `copy --from` to silently skip files that the remote does not have, to avoid much unnecessary output when processing a lot of files. Maybe `get --from` should behave differently?
"""]]

8
doc/bugs/failure_to_find_file_that___34__should__34___exist_in_remote_is_silent/comment_4_7d642fc65040a7b583cdece33db01826._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.246.110"
subject="comment 4"
date="2013-07-27T22:40:58Z"
content="""
I should add that it also seems to make sense to stat the file to see if it's present, like it does now. The location log can be out of date, and when more accurate info is right there, it should use it. And nor is the location log being out of date something that it should complain about, because it can easily happen eg when `git annex sync` has not been run recently.
"""]]

18
doc/bugs/remote_files_appear_but_are_unreadable_because_their_symlink_targets_don__39__t_exist/comment_11_434ed328a22a6657dba3b2929a56e499._comment Normal file
View file

@ -0,0 +1,18 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.246.110"
subject="comment 11"
date="2013-07-28T00:06:53Z"
content="""
From the log on bang:
<pre>
[2013-07-27 00:33:15 PDT] read: ssh [\"-S\",\"/home/drewp/annex2/.git/annex/ssh/drewp@git-annex-dash.local-drewp_annex2\",\"-o\",\"ControlMaster=auto\",\"-o\",\"ControlPersist=yes\",\"-T\",\"drewp@git-annex-dash.local-drewp_annex2\",\"git-annex-shell 'configlist' '/~/annex2/'\"]
zsh:1: command not found: git-annex-shell
Remote dash.local_annex2 does not have git-annex installed; setting remote.dash.local_annex2.annex-ignore
</pre>
You said you're running from the standalone tarball. I think that's the problem, probably if you get git-annex-shell into your path it'll just work.
Can you paste the line git-annex added to \"dash\"'s .ssh/authorized_keys?
"""]]

10
doc/bugs/unannex_removes_object_even_if_referred_to_by_others/comment_3_3f7f4b55b7ec2641a70109788e0b5672._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.246.110"
subject="comment 3"
date="2013-07-27T23:51:38Z"
content="""
uninit does not do this. Nor does unannex --fast FWIW.
"""]]

8
doc/forum/Making_git-annex_a_self-funded_project__63__/comment_2_7c476ae92e63c991f229708678874ca2._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.246.110"
subject="comment 2"
date="2013-07-28T00:21:39Z"
content="""
A few people have suggested that idea. I don't know if I want to get into the HW business.
"""]]

8
doc/forum/Newbie_stuck_at___34__Unable_to_connect_to_the_Jabber_server__34__/comment_1_59158afcedac18a7285d57491b2a468a._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.246.110"
subject="comment 1"
date="2013-07-27T22:13:49Z"
content="""
Since 2012 git-annex has had massive improvements to its Jabber support. See [[/install/Ubuntu]] to get a current version.
"""]]

13
doc/forum/Undo_Git_Annex_Changes_To_Linked_Files/comment_1_568dde820c2608d86d05b07444146a26._comment Normal file
View file

@ -0,0 +1,13 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.246.110"
subject="comment 1"
date="2013-07-28T00:09:45Z"
content="""
Run:
`git annex get $file`
`git annex unannex $file`
$file will now be back how it was before you used git-annex. Can also run above on whole directories.
"""]]

14
doc/forum/how_to_decrypt_file_from_encrypted_special_remote__63__.mdwn Normal file
View file

@ -0,0 +1,14 @@
I have an encrypted S3 remote with which I recently ran:
$> git annex move . --from cloud
which moved all my files to the local repo. When I looked at my S3 bucket, I saw some files left. I then ran:
$> git annex unused --from cloud
to get all the unused data. I dropped each unused data from cloud so that now I think git annex believes it has nothing on the cloud remote.
However there is still one file left on the bucket. Is this normal? (if not I'll create a bug report)
More importantly, how can I decrypt this file so I can run git log -S'KEY' to figure out what it is (I want to make sure I haven't lost any data).
To be clear, when I currently run 'git annex move . --from cloud' it moves nothing and when I run 'git annex unused --from cloud' it reports no unused data.

8
doc/forum/how_to_decrypt_file_from_encrypted_special_remote__63__/comment_1_d4dc451892e7a6e230bf32adb7f3f9fa._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkiAsTXFXZbLE8iyy6yDtvz4MPFbzsk3c0"
nickname="Tony"
subject="comment 1"
date="2013-07-27T22:14:11Z"
content="""
one more thing, I forgot to mention I use gpg keys for encryption on the remote and not a shared key.
"""]]

14
doc/forum/how_to_decrypt_file_from_encrypted_special_remote__63__/comment_2_79340bf3c0691073a9808c5ac2da0a3d._comment Normal file
View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.246.110"
subject="comment 2"
date="2013-07-27T22:30:50Z"
content="""
I suppose this could happen if you have a tag or a branch or another repository that still refers to the file that's stored in S3. It would then not be found by `unused`.
git-annex 4.20130709 has a nice new --all switch you can use: `git annex move --all --from cloud`
If that doesn't move the file, nothing in the entire history of the git repository refers to it. The question then would be how did that file get there.
It's by [[design|design/encryption]] not possible to get from the name of an encrypted file back to the key, unless you already know all the possible keys that the file could be. It's possible to decrypt the content if you have the gpg key and the git repository, but this space is a bit too small to explain every step in doing so, and I have some nice code that explains how in detail. ;)
"""]]

12
doc/forum/how_to_decrypt_file_from_encrypted_special_remote__63__/comment_3_6302fb6e5bb7cbddf2cfe74d98d32897._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkiAsTXFXZbLE8iyy6yDtvz4MPFbzsk3c0"
nickname="Tony"
subject="comment 3"
date="2013-07-27T22:47:14Z"
content="""
thanks, running
'git annex move --all --from cloud'
grabbed the one remaining file from the bucket.
"""]]

8
doc/forum/how_to_decrypt_file_from_encrypted_special_remote__63__/comment_4_e3d95bc09c9fb21e8e9bbacc642aa60f._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.246.110"
subject="comment 4"
date="2013-07-27T22:52:00Z"
content="""
Great! And it should have also printed out the key it downloaded, if you're curious about looking where that file is used in your git repository.
"""]]

8
doc/forum/how_to_decrypt_file_from_encrypted_special_remote__63__/comment_5_f2f0a1c2fb0c6323707b11e2b06aa2db._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkiAsTXFXZbLE8iyy6yDtvz4MPFbzsk3c0"
nickname="Tony"
subject="comment 5"
date="2013-07-27T23:02:19Z"
content="""
yeah it did print out the name of the file so I was able to verify that it was nothing I was worried about losing. thanks again :D
"""]]

8
doc/forum/how_to_decrypt_file_from_encrypted_special_remote__63__/comment_6_66fe80e634a8f13cce18fe68974ec67a._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.246.110"
subject="comment 6"
date="2013-07-27T23:06:38Z"
content="""
I'm curious, why didn't `git annex unused --from cloud` show the file? Was it a tag/branch/etc still referring to it?
"""]]

13
doc/install/Android/comment_5_40cb6cb72c4ad4aa19a4a40f41a6a757._comment Normal file
View file

@ -0,0 +1,13 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnljkMF1zhScDfvJYMhXXubnar_DakLoas"
nickname="Tony"
subject="broken under 4.3?"
date="2013-07-28T00:36:51Z"
content="""
Things seem broken under the recently released 4.3 release for nexus devices:
>Falling back to hardcoded app location; cannot find expected files in /data/app-lib
>u0_a33@mako:/sdcard/git-annex.home $ git annex webapp
>CANNOT LINK EXECUTABLE: git-annex invalid R_ARM_COPY relocation against DT_SYMBOLIC shared library libc.so (built. with -Bsymbolic?)
>1|u0_a33@mako:/sdcard/git-annex.home $
"""]]

8
doc/special_remotes/rsync/comment_6_e687b9482b177e1351c8c65ea617d3fa._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.246.110"
subject="comment 6"
date="2013-07-28T00:11:38Z"
content="""
The first example on this page shows using rsync:// to store files on a system using the rsync daemon.
"""]]