From 204416b80fbb5853d87e6a7cfbf35a0a719c4516 Mon Sep 17 00:00:00 2001 From: Konstantin Ryabitsev Date: Thu, 28 May 2020 12:12:16 -0400 Subject: Don't output git am suggestion for -o - Since we're piping out to stdout, there's obviously no reason to show what the "git am" command should be -- especially if we delete the temporary mbox file after the command completes. Signed-off-by: Konstantin Ryabitsev --- b4/mbox.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/b4/mbox.py b/b4/mbox.py index 3e69a32..85f9fcd 100644 --- a/b4/mbox.py +++ b/b4/mbox.py @@ -188,7 +188,8 @@ def mbox_to_am(mboxfile, cmdargs): if base_commit: logger.critical(' Base: %s', base_commit) logger.critical(' git checkout -b %s %s', gitbranch, base_commit) - logger.critical(' git am %s', am_filename) + if cmdargs.outdir != '-': + logger.critical(' git am %s', am_filename) else: cleanmsg = '' if topdir is not None: @@ -224,7 +225,8 @@ def mbox_to_am(mboxfile, cmdargs): cleanmsg = ' (best guess: %s)' % tag logger.critical(' Base: not found%s', cleanmsg) - logger.critical(' git am %s', am_filename) + if cmdargs.outdir != '-': + logger.critical(' git am %s', am_filename) am_mbx.close() if cmdargs.outdir == '-': -- cgit v1.2.3