mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'missingh-1.2.0.2' of https://github.com/zyv/git-annex

Browse source
This commit is contained in:
Joey Hess 2013-08-24 09:50:02 -04:00
commit fbae240e39
11 changed files with 186 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

17
doc/bugs/Problem_when_dropping_unused_files.mdwn Normal file
View file

@ -0,0 +1,17 @@
### Please describe the problem.
While dropping 19 unused files from an annex, I got this error:
error: invalid object 100644 c873416e78db4dd94b6ab40470d6fe99b2ecb8bd for '002/0a6/SHA256E-s427690--03aeabcde841b66168b72de80098d74e047f3ffc832d4bbefa1f2f70ee6c92f8.jpg.log'
fatal: git-write-tree: error building trees
git-annex: failed to read sha from git write-tree
I've actually seen this before, a few months ago.
### What steps will reproduce the problem?
I have no idea, but once it happens I can't interact with unused files anymore. Also, `git annex fsck` now reports this same problem as well.
### What version of git-annex are you using? On what operating system?
git-annex version: 4.20130815, OS X 10.8.4

10
doc/bugs/Problem_when_dropping_unused_files/comment_1_e1a99bd3eb8b3186653b52a52b1836de._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89"
nickname="John"
subject="comment 1"
date="2013-08-24T05:01:37Z"
content="""
The following command restored some sanity:
find .git/annex/ -name '*.log' -delete
"""]]

45
doc/bugs/Unable_to_import_feed/comment_1_16230fbbb996e165b84787ed4d5f72ea._comment Normal file
View file

@ -0,0 +1,45 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.0.63"
subject="comment 1"
date="2013-08-23T18:09:27Z"
content="""
When I try this, without the German translation, I get:
<pre>
joey@gnu:~/tmp/newrepo>git annex importfeed 'http://www.ndr.de/fernsehen/sendungen/extra_3/videos/zum_mitnehmen/extradrei196_version-hq.xml'
(checking known urls...)
importfeed http://www.ndr.de/fernsehen/sendungen/extra_3/videos/zum_mitnehmen/extradrei196_version-hq.xml
--2013-08-23 13:58:19-- http://www.ndr.de/fernsehen/sendungen/extra_3/videos/zum_mitnehmen/extradrei196_version-hq.xml
Resolving www.ndr.de (www.ndr.de)... 23.73.180.154, 23.73.180.115
Connecting to www.ndr.de (www.ndr.de)|23.73.180.154|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 61865 (60K) [application/xml]
Saving to: ‘/home/joey/tmp/feed31120’
100%[======================================>] 61,865 151KB/s in 0.4s
2013-08-23 13:58:25 (151 KB/s) - ‘/home/joey/tmp/feed31120’ saved [61865/61865]
warning: bad feed content
</pre>
It seems you left out the last line of the error.
The feed library seems to fail to find any of the enclosures in this feed, although it is able to parse it as far as finding the individual items in the feed:
<pre>
Prelude Text.Feed.Query Text.Feed.Import> f <- parseFeedFromFile \"extradrei196_version-hq.xml\"
Prelude Text.Feed.Query Text.Feed.Import> map getItemEnclosure $ feedItems f
[Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing,Nothing]
</pre>
The feed *appears* to contain enclosures, for example:
<pre>
<enclosure url=\"http://media.ndr.de/progressive/2013/0821/TV-20130821-2329-5942.hq.mp4\" type=\"video/mp4\"/>
</pre>
It may not be well-formed, or the feed library may have a bug. Assuming the latter, I have filed a bug report on the feed library: https://github.com/sof/feed/issues/3
"""]]