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

followup to bug I cannot reproduce, and analysis based presumptive fix

Browse source
This commit is contained in:
Joey Hess 2015-04-09 14:03:44 -04:00
parent e1d1c4f51c
commit b99b8d5d4c
2 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Annex/Branch.hs
View file

@ -414,6 +414,7 @@ stageJournal jl = withIndex $ do
g <- gitRepo g <- gitRepo
let dir = gitAnnexJournalDir g let dir = gitAnnexJournalDir g
(jlogf, jlogh) <- openjlog (jlogf, jlogh) <- openjlog
liftIO $ fileEncoding jlogh
withJournalHandle $ \jh -> do withJournalHandle $ \jh -> do
h <- hashObjectStart g h <- hashObjectStart g
Git.UpdateIndex.streamUpdateIndex g Git.UpdateIndex.streamUpdateIndex g

27
doc/bugs/commitBuffer:_invalid_argument___40__invalid_character__41__/comment_1_b56c847c5eda432a4330b4d853a25519._comment Normal file
View file

@ -0,0 +1,27 @@
[[!comment format=mdwn
username="joey"
subject="""comment 1"""
date="2015-04-09T17:49:57Z"
content="""
I cannot reproduce this, I get:
addurl _dev_radio/DR14__Verschwörungstheorien.ogg ok
Does the _dev_radio/DR14__Verschwörungstheorien.ogg file get created?
If so, how does it look?
The jlog tells me it's trying to commit the git-annex branch journal.
Does .git/annex/journal/ contain any files? Any files containing German
characters?
Do you have any git config settings for git-annex beyone the typical
annex.uuid?
I noticed one place in the journal commit code where it does seem to
neglect to use filesystem encoding when dealing with writing filenames to
the jlog tmpfile. Which could lead to this crash theoretically. I've fixed
that, but since I couldn't reproduce the problem, I don't know if this will
fix your problem. Nor do I understand how annex journal log files could
have these characters in their names. You can try today's upcoming release
of git-annex to test the fix though.
"""]]