Read default diff options from the user's config

[stgit] / stgit / utils.py

diff --git a/stgit/utils.py b/stgit/utils.py
index 43366c92a84d4171eac28d3cc054fb5d4d1545c4..b75c3b4ff0cc07a37cc2c2f7a062722b1f4be07e 100644 (file)
--- a/stgit/utils.py
+++ b/stgit/utils.py
@@ -316,7 +316,8 @@ def make_diff_opts_option():
         else:
             parser.values.diff_flags = []
     return [optparse.make_option(
         else:
             parser.values.diff_flags = []
     return [optparse.make_option(

-        '-O', '--diff-opts', dest = 'diff_flags', default = [],
+        '-O', '--diff-opts', dest = 'diff_flags',
+        default = (config.get('stgit.diff-opts') or '').split(),

         action = 'callback', callback = diff_opts_callback,
         type = 'string', metavar = 'OPTIONS',
         help = 'extra options to pass to "git diff"')]
         action = 'callback', callback = diff_opts_callback,
         type = 'string', metavar = 'OPTIONS',
         help = 'extra options to pass to "git diff"')]