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

Improve 'arc land' in immutable workflows

Browse source 
Summary: Better instructions in the 'git merge' failure case for 'arc land'.

Test Plan: no you test

Reviewers: fratrik, btrahan, jungejason

Reviewed By: fratrik

CC: aran, epriestley

Differential Revision: https://secure.phabricator.com/D1500
This commit is contained in:
epriestley 2012-01-26 17:41:11 -08:00
parent 9c11adc661
commit b1cd4f8efa
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/workflow/land/ArcanistLandWorkflow.php
View file

@ -217,11 +217,17 @@ EOTEXT
if ($is_immutable) { if ($is_immutable) {
// In immutable histories, do a --no-ff merge to force a merge commit with // In immutable histories, do a --no-ff merge to force a merge commit with
// the right message. // the right message.
execx( $err = phutil_passthru(
'(cd %s && git merge --no-ff -m %s %s)', '(cd %s && git merge --no-ff -m %s %s)',
$repository_api->getPath(), $repository_api->getPath(),
$message, $message,
$branch); $branch);
if ($err) {
throw new ArcanistUsageException(
"'git merge' failed. Your working copy has been left in a partially ".
"merged state. You can: abort with 'git merge --abort'; or follow ".
"the instructions to complete the merge, and then push.");
}
} else { } else {
// In mutable histories, do a --squash merge. // In mutable histories, do a --squash merge.
execx( execx(