diff -r ca5b833ce756 -r aacb17cc0ee4 mercurial/patch.py
--- a/mercurial/patch.py	Sun Oct 08 20:43:46 2017 +0200
+++ b/mercurial/patch.py	Sun Oct 08 21:47:14 2017 +0200
@@ -2235,7 +2235,7 @@
                 return v
         if forceplain is not None and ui.plain():
             return forceplain
-        return getter(section, name or key, None, untrusted=untrusted)
+        return getter(section, name or key, untrusted=untrusted)
 
     # core options, expected to be understood by every diff parser
     buildopts = {