diff -r ec8c73b02e2e -r ac072c79bd9d mercurial/patch.py
--- a/mercurial/patch.py	Wed Nov 12 23:25:32 2014 -0800
+++ b/mercurial/patch.py	Wed Nov 12 23:44:17 2014 -0800
@@ -1559,9 +1559,13 @@
     pass
 
 def diffopts(ui, opts=None, untrusted=False, section='diff'):
-    def get(key, name=None, getter=ui.configbool):
-        return ((opts and opts.get(key)) or
-                getter(section, name or key, None, untrusted=untrusted))
+    def get(key, name=None, getter=ui.configbool, forceplain=None):
+        if opts:
+            v = opts.get(key)
+            if v:
+                return v
+        return getter(section, name or key, None, untrusted=untrusted)
+
     return mdiff.diffopts(
         text=opts and opts.get('text'),
         git=get('git'),