summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOwen W. Taylor <otaylor@fishsoup.net>2013-08-01 05:22:43 -0400
committerOwen W. Taylor <otaylor@fishsoup.net>2013-08-01 05:22:43 -0400
commit28228abc547bc9eb1ce27964188056b1bd1012e8 (patch)
tree8615a9f7df1a7d08bcabb7a174f022e66994e0eb
parent83860382728e08e804bd12e5190570d18658caf0 (diff)
downloadgit-bz-28228abc547bc9eb1ce27964188056b1bd1012e8.tar.gz
Fix applying non-ASCII plain diffs
The code that applied plain diff tried to add a Unicode header to uninterpreted patch data. https://bugzilla.gnome.org/show_bug.cgi?id=687734
-rwxr-xr-xgit-bz2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-bz b/git-bz
index cdaf031..dbdef34 100755
--- a/git-bz
+++ b/git-bz
@@ -1664,7 +1664,7 @@ Subject: %s
""" % (name, email, patch.date, patch.description)
# The exact string 'FIXME: need commit message' is checked for by
# git.gnome.org commit hooks, so they need to be updated if it changes.
- patch.data = headers + """
+ patch.data = headers.encode('UTF-8') + """
FIXME: need commit message.
(Please also double check the author and subject.)