Add a check for ambiguous merge strategies after the "history.immutable" behavioral change
ClosedPublic
Actions

Authored by epriestley on Jun 8 2020, 1:40 PM.

Details

Reviewers: None
Maniphest Tasks: T13546: Modernize the "arc land" workflow
Commits: rARC78e9cc9c0129: Add a check for ambiguous merge strategies after the "history.immutable"…

Summary

Ref T13546. When users hit a situation where we would select "squash" but would previously select "merge", prevent them from continuing under ambiguous conditions.

Test Plan

Ran "arc land" in Git with "history.immutable" true, false, and not configured.

Diff Detail

Repository

rARC Arcanist

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

epriestley created this revision.Jun 8 2020, 1:40 PM

Harbormaster completed remote builds in B24584: Diff 50762.Jun 8 2020, 1:40 PM

epriestley requested review of this revision.Jun 8 2020, 1:40 PM

This revision was not accepted when it landed; it landed in state Needs Review.Jun 8 2020, 11:26 PM

Closed by commit rARC78e9cc9c0129: Add a check for ambiguous merge strategies after the "history.immutable"… (authored by epriestley). · Explain Why

This revision was automatically updated to reflect the committed changes.

epriestley added a commit: rARC78e9cc9c0129: Add a check for ambiguous merge strategies after the "history.immutable"….

Revision Contents
Changeset List

Path

Size

src/

land/

engine/

ArcanistGitLandEngine.php

48 lines

ArcanistLandEngine.php

22 lines

Diff 50795

View Options

src/land/engine/ArcanistGitLandEngine.php