Fix a crash when merging files in the git-annex branch that contain invalid utf8.

The crash actually occurred when writing out the file, which was done to a
handle that had not had fileSystemEncoding applied to it.
This commit is contained in:
Joey Hess 2012-10-12 12:19:30 -04:00
parent aa8b15d966
commit e05c21cb73
4 changed files with 17 additions and 5 deletions

2
debian/changelog vendored
View file

@ -13,6 +13,8 @@ git-annex (3.20121010) UNRELEASED; urgency=low
their group, or even to disable syncing to them.
* git config remote.name.annex-sync can be used to control whether
a remote gets synced.
* Fix a crash when merging files in the git-annex branch that contain
invalid utf8.
-- Joey Hess <joeyh@debian.org> Wed, 10 Oct 2012 12:59:25 -0400