summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Ryabitsev <konstantin@linuxfoundation.org>2020-05-28 12:12:16 -0400
committerKonstantin Ryabitsev <konstantin@linuxfoundation.org>2020-05-28 12:12:16 -0400
commit204416b80fbb5853d87e6a7cfbf35a0a719c4516 (patch)
treef8b430ba6c807f844702c9417450b9097ad67c49
parent5e9931c213685938c79d855856a16ff9131772d5 (diff)
downloadb4-204416b80fbb5853d87e6a7cfbf35a0a719c4516.tar.gz
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 <konstantin@linuxfoundation.org>
-rw-r--r--b4/mbox.py6
1 files 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 == '-':