Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Hide Git merge stats in arc land

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...
commit 3af36c6a4e93d4446ab9cc3b01aa26c0ff7b3468 1 parent c77ec2b
@vrana vrana authored
Showing with 3 additions and 3 deletions.
  1. +3 −3 src/workflow/ArcanistLandWorkflow.php
View
6 src/workflow/ArcanistLandWorkflow.php
@@ -584,7 +584,7 @@ private function rebase() {
}
} else {
$err = phutil_passthru(
- 'git merge %s -m %s',
+ 'git merge --no-stat %s -m %s',
$this->onto,
"Automatic merge by 'arc land'");
if ($err) {
@@ -630,7 +630,7 @@ private function squash() {
if ($this->isGit) {
$repository_api->execxLocal('checkout %s', $this->onto);
$repository_api->execxLocal(
- 'merge --squash --ff-only %s',
+ 'merge --no-stat --squash --ff-only %s',
$this->branch);
} else if ($this->isHg) {
// The hg code is a little more complex than git's because we
@@ -801,7 +801,7 @@ private function merge() {
chdir($repository_api->getPath());
if ($this->isGit) {
$err = phutil_passthru(
- 'git merge --no-ff --no-commit %s',
+ 'git merge --no-stat --no-ff --no-commit %s',
$this->branch);
if ($err) {
Please sign in to comment.
Something went wrong with that request. Please try again.