# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1410804740 18000
# Node ID 6fd944c204a9f150be39915924ee764335ea38dd
# Parent  1f72226064b8df093317edfd37c8b4472ca1ba22
encoding: handle empty string in toutf8

diff --git a/mercurial/encoding.py b/mercurial/encoding.py
--- a/mercurial/encoding.py
+++ b/mercurial/encoding.py
@@ -336,8 +336,8 @@
         return s._utf8
 
     try:
-        if s.decode('utf-8'):
-            return s
+        s.decode('utf-8')
+        return s
     except UnicodeDecodeError:
         # surrogate-encode any characters that don't round-trip
         s2 = s.decode('utf-8', 'ignore').encode('utf-8')