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 <cel@netapp.com>

diff --git a/stgit/commands/push.py b/stgit/commands/push.py
index a4b507ea3e41542bf7f4d91185b7bafadf12a9c7..5da969a3e85753cd4000cb458bd8091866304759 100644 (file)
--- a/stgit/commands/push.py
+++ b/stgit/commands/push.py
@@ -120,16 +120,12 @@ def func(parser, options, args):
     if options.reverse:
         patches.reverse()
 
     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]
     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:
 
     for p in patches[forwarded:]:
         if p not in unapplied: