revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-22 23:02:41 +01:00
Code Issues Releases Wiki Activity

Hide Git merge stats in arc land

Browse source 
Test Plan:
  $ arc land # in Git repo

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D5599
This commit is contained in:
Jakub Vrana 2013-04-06 09:23:41 -07:00
parent c77ec2bdc6
commit 3af36c6a4e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/workflow/ArcanistLandWorkflow.php
View file

@ -584,7 +584,7 @@ EOTEXT
} }
} else { } else {
$err = phutil_passthru( $err = phutil_passthru(
'git merge %s -m %s', 'git merge --no-stat %s -m %s',
$this->onto, $this->onto,
"Automatic merge by 'arc land'"); "Automatic merge by 'arc land'");
if ($err) { if ($err) {
@ -630,7 +630,7 @@ EOTEXT
if ($this->isGit) { if ($this->isGit) {
$repository_api->execxLocal('checkout %s', $this->onto); $repository_api->execxLocal('checkout %s', $this->onto);
$repository_api->execxLocal( $repository_api->execxLocal(
'merge --squash --ff-only %s', 'merge --no-stat --squash --ff-only %s',
$this->branch); $this->branch);
} else if ($this->isHg) { } else if ($this->isHg) {
// The hg code is a little more complex than git's because we // The hg code is a little more complex than git's because we
@ -801,7 +801,7 @@ EOTEXT
chdir($repository_api->getPath()); chdir($repository_api->getPath());
if ($this->isGit) { if ($this->isGit) {
$err = phutil_passthru( $err = phutil_passthru(
'git merge --no-ff --no-commit %s', 'git merge --no-stat --no-ff --no-commit %s',
$this->branch); $this->branch);
if ($err) { if ($err) {