Homec4science

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

Authored by epriestley <git@epriestley.com> on Oct 26 2015, 21:26.

Description

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

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

Details

Committed
epriestley <autocommitter@example.com>Oct 26 2015, 21:26
Pushed
aubortJan 31 2017, 17:16
Parents
rPH0b24a6e2006e: Make "Land Revision" show merge conflicts more clearly
Branches
Unknown
Tags
Unknown

Event Timeline

epriestley <autocommitter@example.com> committed rPH5a35dd233b19: Don't use --ff-only inside "Land Revision" (authored by epriestley <git@epriestley.com>).Oct 26 2015, 21:26