Page MenuHomePhabricator

[land-bot] Fix git HEAD after checking revision
ClosedPublic

Authored by jasonbcox on Sep 17 2020, 18:24.

Details

Reviewers
deadalnix
Group Reviewers
Restricted Project
Commits
rABC9acea42cd09f: [land-bot] Fix git HEAD after checking revision
Summary

D7455 breaks the land bot because arc land --hold
detaches git HEAD when it's expected to be on branch master.

Test Plan
CONDUIT_TOKEN=<token> ./apply-revision.sh Dxxxx
git log

Pre-patch git log will show HEAD in a detached state.
Post-patch, git log will show HEAD pointing as master with
one new commit, as expected.

Diff Detail

Repository
rABC Bitcoin ABC
Branch
fix-apply-rev
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 12800
Build 25673: Build Diffbuild-clang-10 · build-clang-tidy · build-diff · build-without-wallet
Build 25672: arc lint + arc unit

Event Timeline

deadalnix requested changes to this revision.Sep 18 2020, 00:53
deadalnix added a subscriber: deadalnix.
deadalnix added inline comments.
contrib/source-control-tools/apply-revision.sh
67 ↗(On Diff #23562)

Why put a comment when you could actually check that this is true?

This revision now requires changes to proceed.Sep 18 2020, 00:53

Add explicit check that HEAD has no changes from master

This revision is now accepted and ready to land.Sep 18 2020, 23:20