--- a/mercurial/changegroup.py	Fri Jan 08 14:33:13 2016 -0800
+++ b/mercurial/changegroup.py	Fri Jan 08 14:47:02 2016 -0800
@@ -903,8 +903,8 @@
         dirlog = self._repo.manifest.dirlog
         for name, nodes in tmfnodes.iteritems():
             # For now, directory headers are simply file headers with
-            # a trailing '/' on the path.
-            yield self.fileheader(name + '/')
+            # a trailing '/' on the path (already in the name).
+            yield self.fileheader(name)
             for chunk in self.group(nodes, dirlog(name), nodes.get):
                 yield chunk