Add a stdout option to the config that is equivalent to the --stdout command line option. This allows for easier debugging for a hook Signed-off-by: Dave Boutcher <daveboutcher@xxxxxxxxx> --- git-multimail/README | 5 +++++ git-multimail/git_multimail.py | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/git-multimail/README b/git-multimail/README index 49e0937..0235b83 100644 --- a/git-multimail/README +++ b/git-multimail/README @@ -400,6 +400,11 @@ multimailhook.quiet Do not output the list of email recipients from the hook +multimailhook.stdout + + For debugging, send emails to stdout rather than to the + mailer. Equivalent to the --stdout command line option + Email filtering aids -------------------- diff --git a/git-multimail/git_multimail.py b/git-multimail/git_multimail.py index 095110a..35a1140 100755 --- a/git-multimail/git_multimail.py +++ b/git-multimail/git_multimail.py @@ -1585,6 +1585,9 @@ class Environment(object): quiet (bool) On success do not write to stderr + stdout (bool) + Write email to stdout rather than emailing. Useful for debugging + """ REPO_NAME_RE = re.compile(r'^(?P<name>.+?)(?:\.git)$') @@ -1598,6 +1601,7 @@ class Environment(object): self.refchange_showlog = False self.commitlogopts = ['-C', '--stat', '-p', '--cc'] self.quiet = False + self.stdout = False self.COMPUTED_KEYS = [ 'administrator', @@ -1753,6 +1757,10 @@ class ConfigOptionsEnvironmentMixin(ConfigEnvironmentMixin): 'quiet', default=False ) + self.stdout = config.get_bool( + 'stdout', default=False + ) + maxcommitemails = config.get('maxcommitemails') if maxcommitemails is not None: try: @@ -2563,7 +2571,7 @@ def main(args): sys.stderr.write(' %s : %r\n' % (k, v)) sys.stderr.write('\n') - if options.stdout: + if options.stdout or environment.stdout: mailer = OutputMailer(sys.stdout) else: mailer = choose_mailer(config, environment) -- 2.3.0 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html