Page MenuHomePhabricator

[land-bot] Skip sanity check during arc patch
ClosedPublic

Authored by jasonbcox on Jun 23 2020, 21:10.

Details

Reviewers
Fabien
Group Reviewers
Restricted Project
Commits
rABCef043c751567: [land-bot] Skip sanity check during arc patch
Summary

The sanity check step of arc patch is primarily in place to
prevent accidental landing of a revision before it's base commit.
This check is problematic when the landbot has queued multiple dependent
revisions, as landing the first revision will alter its commit hash and
fail subsequent sanity checks.

This patch uses --force to skip those sanity checks. This is generally
safe since we run our own smoke tests prior to landing, so this will catch
any master-breaking changes that do not encounter merge conflicts.

Test Plan

Find an unlanded revision that depends on another and has not been rebased on master.
./autopatch -r <that-revision>
Should succeed post-patch.

Diff Detail

Repository
rABC Bitcoin ABC
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Fabien added a subscriber: Fabien.
Fabien added inline comments.
contrib/source-control-tools/autopatch.sh
10 ↗(On Diff #21666)

Add a comment to explain why force is needed.

This revision is now accepted and ready to land.Jun 24 2020, 07:09