summaryrefslogtreecommitdiffstats
path: root/project.py
diff options
context:
space:
mode:
authorMike Frysinger <vapier@google.com>2020-02-17 01:07:11 -0500
committerMike Frysinger <vapier@google.com>2020-02-17 06:55:08 +0000
commit2b1345b8c5e519ba7f3d7339dbb49f16fcd9239b (patch)
tree9cc994b9cd085276a7dcb98c415bd4b0c4c8e442 /project.py
parent3995ebd8c1569f2c3e59c33593fed611a923f428 (diff)
downloadgit-repo-2b1345b8c5e519ba7f3d7339dbb49f16fcd9239b.tar.gz
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>
Diffstat (limited to 'project.py')
-rw-r--r--project.py2
1 files changed, 1 insertions, 1 deletions
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):
2584 raise GitError('%s rebase %s ' % (self.name, upstream)) 2584 raise GitError('%s rebase %s ' % (self.name, upstream))
2585 2585
2586 def _FastForward(self, head, ffonly=False): 2586 def _FastForward(self, head, ffonly=False):
2587 cmd = ['merge', head] 2587 cmd = ['merge', '--no-stat', head]
2588 if ffonly: 2588 if ffonly:
2589 cmd.append("--ff-only") 2589 cmd.append("--ff-only")
2590 if GitCommand(self, cmd).Wait() != 0: 2590 if GitCommand(self, cmd).Wait() != 0: