From: Chuck Lever Date: Wed, 21 Sep 2005 18:01:45 +0000 (-0400) Subject: Cut verbosity of new fast-forward merging X-Git-Tag: v0.7~11 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/acad60579782ce281c4943bd2e5a2646310e5a97?hp=40e65b928d0429090a39843c1a81dec31f4d38e2 Cut verbosity of new fast-forward merging Now "stg push" will report only that is "Fast-forwarding" or "Pushing" a patch. The messages about trying to fast-forward and failing are gone. Signed-off-by: Chuck Lever --- diff --git a/stgit/commands/push.py b/stgit/commands/push.py index a4b507e..5da969a 100644 --- a/stgit/commands/push.py +++ b/stgit/commands/push.py @@ -120,16 +120,12 @@ def func(parser, options, args): if options.reverse: patches.reverse() - print 'Trying fast-forward...' - forwarded = crt_series.forward_patches(patches) if forwarded > 1: print 'Fast-forwarded patches "%s" - "%s"' % (patches[0], patches[forwarded - 1]) elif forwarded == 1: print 'Fast-forwarded patch "%s"' % patches[0] - else: - print 'Fast-forwarding failed, using normal pushing' for p in patches[forwarded:]: if p not in unapplied: