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

This commit is contained in:
Joey Hess 2012-11-29 17:01:35 -04:00
commit 1536fa6f4b
7 changed files with 94 additions and 0 deletions

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.6.49"
subject="comment 11"
date="2012-11-29T19:55:17Z"
content="""
I've dealt with these ssh issues by including ssh in the app bundle.
OTOH, I don't know how `git config --null --list` could possibly take any appreciable amount of CPU to run.
"""]]

View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.6.49"
subject="comment 1"
date="2012-11-29T20:13:53Z"
content="""
Hmm, is this an encrypted rsync remote?
I have not been able to reproduce the problem so fat.
If you start the assistant with --debug, and look in .git/annex/daemon.log, you should find where it runs gpg, and the lines showing what it's doing just before/after that should provide a hint what it's doing.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://grossmeier.net/"
nickname="greg"
subject="comment 2"
date="2012-11-29T19:55:25Z"
content="""
Thanks, Joey. I've reported it [downstream in LP](https://bugs.launchpad.net/ubuntu/+source/git-annex/+bug/1084693).
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.6.49"
subject="comment 3"
date="2012-11-29T20:22:01Z"
content="""
No, moving files within the repository is unlikely to be related.
If you can show me what the filenames look like I'll have a much better chance of getting somewhere, since they do not seem to be filenames that `git annex unused` knows how to deal with, and so I don't know what they could be.
"""]]

View file

@ -0,0 +1,27 @@
[[!comment format=mdwn
username="http://edheil.wordpress.com/"
ip="173.162.44.162"
subject="comment 4"
date="2012-11-29T20:33:09Z"
content="""
They're the full actual filenames (but not directories) of particular files in my repository, sometimes with numeric suffixes (or rather, numbers before the file suffixes), like this:
746.DS_Store
747.DS_Store
748.DS_Store
749.DS_Store
Birdplane87712.mp4
Birdplane87713.mp4
Bodyrock87712.mp4
Bodyrock87713.mp4
Dubstep Violin- Lindsey Stirling- Crystallize746.mp4
Dubstep Violin- Lindsey Stirling- Crystallize87712.mp4
Dubstep Violin- Lindsey Stirling- Crystallize87713.mp4
Handlebars (fan video)87712.mp4
Handlebars (fan video)87713.mp4
Handlebars (official)87712.mp4
Handlebars (official)87713.mp4
Most of them are videos, and I've moved videos around a lot in my repository, and made some mistakes doing so from time to time when I was first learning git-annex, and fooling around on the command line -- breaking symlinks and figuring out how to fix that with git-annex fix.
"""]]

View file

@ -0,0 +1,13 @@
[[!comment format=mdwn
username="http://edheil.wordpress.com/"
ip="173.162.44.162"
subject="comment 5"
date="2012-11-29T20:47:36Z"
content="""
Oh, another stupid thing I might have done --
* added files to the repo, and not realizing it might take assistant a while to recognize and add them all, gotten impatient
* added them myself, but did it with \"import\" instead of \"add\" so I was git-annex importing files from *inside* git-annex, with an assistant process running at the same time.
Might not be relevant, just trying to think of weird things I've done.
"""]]

View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.6.49"
subject="comment 6"
date="2012-11-29T20:53:34Z"
content="""
Ah, I think I know what this is. When the assistant notices a new file appear, it makes a hard link in the temp directory to the new file, and waits for it to stop being written to.
If the hard link is broken before the assistant is done adding the file to the annex, it looks like it could leave the temp file behind. I've committed a change that should avoid that.
Since some of these are OSX DS_Store files, and the rest have a strange number added (which git-annex did not do), I suspect you moved them into the annexed directory using the OSX Finder or something like that, and whatever was putting them into the directory first wrote them with the names we see here. Then, while git-annex was still processing them, they got renamed.
I'd say you can safely delete them.
"""]]