--- a/mercurial/bundle2.py	Sat Apr 11 14:44:12 2015 -0400
+++ b/mercurial/bundle2.py	Sat Apr 11 17:30:45 2015 -0400
@@ -357,10 +357,10 @@
         finally:
             if output is not None:
                 output = op.ui.popbuffer()
-        if output:
-            outpart = op.reply.newpart('output', data=output,
-                                       mandatory=False)
-            outpart.addparam('in-reply-to', str(part.id), mandatory=False)
+            if output:
+                outpart = op.reply.newpart('output', data=output,
+                                           mandatory=False)
+                outpart.addparam('in-reply-to', str(part.id), mandatory=False)
     finally:
         # consume the part content to not corrupt the stream.
         part.seek(0, 2)