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

Don't use --ff-only inside "Land Revision"

Browse source 
Summary:
Ref T182. I lifted this logic out of `arc`, but the context is a little different there, and this option is too strict in "Land Revision".

Specifically, it prevents `git` from merging unless the merge is //strictly// a fast-foward, even with `--squash`. That means revisions can't merge unless they're rebased on the current `master`, even if they have no conflicts.

(This whole process will probably need additional refinement, but the behavior without this flag is more reasonable overall than the behavior with it for now.)

Test Plan: Will land stuff in production~~

Reviewers: chad, Mnkras

Reviewed By: Mnkras

Maniphest Tasks: T182

Differential Revision: https://secure.phabricator.com/D14346
This commit is contained in:
epriestley 2015-10-26 20:26:56 +00:00 committed by epriestley
parent 0b24a6e200
commit 5a35dd233b
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php
View file

@ -432,7 +432,7 @@ final class DrydockWorkingCopyBlueprintImplementation
$src_ref); $src_ref);
$command = csprintf( $command = csprintf(
'git merge --no-stat --squash --ff-only -- %R', 'git merge --no-stat --squash -- %R',
$src_ref); $src_ref);
try { try {