diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-12 12:19:30 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-12 12:19:30 -0400 |
| commit | a0b643354907628a16f927935de0396382239c59 (patch) | |
| tree | 1641aa8f5309f4d50631555c00df86ec3729a6a7 /debian | |
| parent | 4a63cdd9008bfe34af01c3662af512927a0cee0b (diff) | |
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.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 65e091753..b3e825560 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 |