diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-04-09 14:03:44 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-04-09 14:03:44 -0400 |
| commit | cc60ce60aaba9f9f72057a9172c99515308e2b10 (patch) | |
| tree | 6396fc46a22898e563b8c02848b9e3265033cd9a | |
| parent | 0d3bc53e59a34f126ac0ff2bf4a738ab0a3fee0b (diff) | |
followup to bug I cannot reproduce, and analysis based presumptive fix
| -rw-r--r-- | Annex/Branch.hs | 1 | ||||
| -rw-r--r-- | doc/bugs/commitBuffer:_invalid_argument___40__invalid_character__41__/comment_1_b56c847c5eda432a4330b4d853a25519._comment | 27 |
2 files changed, 28 insertions, 0 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs index 7411e7010..4bd94bddb 100644 --- a/Annex/Branch.hs +++ b/Annex/Branch.hs @@ -414,6 +414,7 @@ stageJournal jl = withIndex $ do g <- gitRepo let dir = gitAnnexJournalDir g (jlogf, jlogh) <- openjlog + liftIO $ fileEncoding jlogh withJournalHandle $ \jh -> do h <- hashObjectStart g Git.UpdateIndex.streamUpdateIndex g diff --git a/doc/bugs/commitBuffer:_invalid_argument___40__invalid_character__41__/comment_1_b56c847c5eda432a4330b4d853a25519._comment b/doc/bugs/commitBuffer:_invalid_argument___40__invalid_character__41__/comment_1_b56c847c5eda432a4330b4d853a25519._comment new file mode 100644 index 000000000..43e6a390b --- /dev/null +++ b/doc/bugs/commitBuffer:_invalid_argument___40__invalid_character__41__/comment_1_b56c847c5eda432a4330b4d853a25519._comment @@ -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. +"""]] |