From 2b1345b8c5e519ba7f3d7339dbb49f16fcd9239b Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@google.com>
Date: Mon, 17 Feb 2020 01:07:11 -0500
Subject: [PATCH] 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.py b/project.py
index d0bf4651..376af7a9 100644
--- a/project.py
+++ b/project.py
@@ -2584,7 +2584,7 @@ class Project(object):
       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: