Page MenuHomePhabricator

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

Authored by epriestley on Oct 26 2015, 8:21 PM.

Details

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~~

Diff Detail

Repository
rP Phabricator
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

epriestley retitled this revision from to Don't use --ff-only inside "Land Revision".
epriestley updated this object.
epriestley edited the test plan for this revision. (Show Details)
epriestley added a reviewer: chad.
Mnkras added a reviewer: Mnkras.
This revision is now accepted and ready to land.Oct 26 2015, 8:26 PM
This revision was automatically updated to reflect the committed changes.