revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2025-02-16 16:58:38 +01:00
Code Issues Releases Wiki Activity

Handles an issue in windows with large code bases not squash merging correctly.

Browse source 
Summary: Handles an issue in windows with large code bases not squash merging correctly, this only catches the issue it doesn't really do any recovery.

Test Plan: We have been running this change in our work environment, it's a hard bug to replicate but when it has reared it's head this has caught it.

Reviewers: waynea, #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: epriestley, Korvin, hach-que

Maniphest Tasks: T4884

Differential Revision: https://secure.phabricator.com/D8729
This commit is contained in:
James Rhodes 2014-05-21 10:15:31 +10:00
parent a19503bb59
commit 6b8552291d
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/workflow/ArcanistLandWorkflow.php
View file

@ -191,7 +191,7 @@ EOTEXT
if ($this->useSquash) { if ($this->useSquash) {
$this->rebase(); $this->rebase();
$this->squash(); $this->squash();
} else { } else {
$this->merge(); $this->merge();
} }
@ -936,6 +936,10 @@ EOTEXT
$repository_api->execxLocal( $repository_api->execxLocal(
'commit -F %s', 'commit -F %s',
$this->messageFile); $this->messageFile);
if (phutil_is_windows()) {
// Occasionally on large repositories on Windows, Git can exit with an unclean working copy here. This prevents reverts from being pushed to the remote when this occurs.
$this->requireCleanWorkingCopy();
}
} else if ($this->isHg) { } else if ($this->isHg) {
// hg rebase produces a commit earlier as part of rebase // hg rebase produces a commit earlier as part of rebase
if (!$this->useSquash) { if (!$this->useSquash) {