commit 2b1345b8c5e519ba7f3d7339dbb49f16fcd9239b
author Mike Frysinger <vapier@google.com> Mon Feb 17 01:07:11 2020 -0500
committer Mike Frysinger <vapier@google.com> Mon Feb 17 06:55:08 2020 +0000
tree 9cc994b9cd085276a7dcb98c415bd4b0c4c8e442
parent 3995ebd8c1569f2c3e59c33593fed611a923f428

project: disable stat output when fast forwarding merges

Our sync output is pretty chatty, and the stat output on fast forward
merges doesn't really help.  Suppress it to tighten up the output.

Change-Id: I91e50639b3cd8db9df3d13a7da6d1aaa70d7932f
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/255412
Reviewed-by: David Pursehouse <dpursehouse@collab.net>
Tested-by: Mike Frysinger <vapier@google.com>

project.py

diff --git a/project.py b/project.py
index d0bf465..376af7a 100644
--- a/project.py
+++ b/project.py
@@ -2584,7 +2584,7 @@
       raise GitError('%s rebase %s ' % (self.name, upstream))
 
   def _FastForward(self, head, ffonly=False):
-    cmd = ['merge', head]
+    cmd = ['merge', '--no-stat', head]
     if ffonly:
       cmd.append("--ff-only")
     if GitCommand(self, cmd).Wait() != 0: