commit 71681bf1e84a4829521cb8a33b7c3331d46580b8
author Edward Lemur <ehmaldonado@chromium.org> Wed Oct 09 23:46:20 2019 +0000
committer Commit Bot <commit-bot@chromium.org> Wed Oct 09 23:46:20 2019 +0000
tree c4cf5a231092dce1eb9694cf36a791d11c6b06e8
parent aeee6a83d519e3076616c0d6753dc0befbe479d3

git-common: Explicitly specify utf-8 when encoding.

Bug: 1012773
Change-Id: I95006ce78b4473c8fb435162089a787b57c0f835
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1850926
Auto-Submit: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Anthony Polito <apolito@google.com>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

git_common.py

diff --git a/git_common.py b/git_common.py
index e022ff3..24c178c 100644
--- a/git_common.py
+++ b/git_common.py
@@ -605,7 +605,7 @@
   """
   with tempfile.TemporaryFile() as f:
     for name, (mode, typ, ref) in treedict.items():
-      f.write(('%s %s %s\t%s\0' % (mode, typ, ref, name)).encode())
+      f.write(('%s %s %s\t%s\0' % (mode, typ, ref, name)).encode('utf-8'))
     f.seek(0)
     return run('mktree', '-z', stdin=f)
 
@@ -862,7 +862,7 @@
     # nothing to commit at this point.
     print('Nothing to commit; squashed branch is empty')
     return False
-  run('commit', '--no-verify', '-a', '-F', '-', indata=log_msg.encode())
+  run('commit', '--no-verify', '-a', '-F', '-', indata=log_msg.encode('utf-8'))
   return True