Cut verbosity of new fast-forward merging
authorChuck Lever <cel@netapp.com>
Wed, 21 Sep 2005 18:01:45 +0000 (14:01 -0400)
committerCatalin Marinas <catalin.marinas@gmail.com>
Wed, 21 Sep 2005 20:57:15 +0000 (21:57 +0100)
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>
stgit/commands/push.py

index a4b507e..5da969a 100644 (file)
@@ -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: