--- a/mercurial/logcmdutil.py Thu Feb 07 10:01:55 2019 -0800
+++ b/mercurial/logcmdutil.py Thu Feb 07 09:52:36 2019 -0800
@@ -123,8 +123,9 @@
# subpath. The best we can do is to ignore it.
tempnode2 = None
submatch = matchmod.subdirmatcher(subpath, match)
+ subprefix = repo.wvfs.reljoin(prefix, subpath)
sub.diff(ui, diffopts, tempnode2, submatch, changes=changes,
- stat=stat, fp=fp, prefix=prefix)
+ stat=stat, fp=fp, prefix=subprefix)
class changesetdiffer(object):
"""Generate diff of changeset with pre-configured filtering functions"""