@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

authored by

epriestley and committed by
epriestley
5a35dd23 0b24a6e2

+1 -1
+1 -1
src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php
··· 432 432 $src_ref); 433 433 434 434 $command = csprintf( 435 - 'git merge --no-stat --squash --ff-only -- %R', 435 + 'git merge --no-stat --squash -- %R', 436 436 $src_ref); 437 437 438 438 try {