Skip to content

Commit

Permalink
Hide Git merge stats in arc land
Browse files Browse the repository at this point in the history
Test Plan:
  $ arc land # in Git repo

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D5599
  • Loading branch information
vrana committed Apr 6, 2013
1 parent c77ec2b commit 3af36c6
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/workflow/ArcanistLandWorkflow.php
Expand Up @@ -584,7 +584,7 @@ private function rebase() {
} }
} 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) {
Expand Down Expand Up @@ -630,7 +630,7 @@ private function squash() {
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
Expand Down Expand Up @@ -801,7 +801,7 @@ private function merge() {
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) {
Expand Down

0 comments on commit 3af36c6

Please sign in to comment.