Page MenuHomePhabricator
Differential D7478

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

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
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

jasonbcox created this revision.Sep 17 2020, 18:24
Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 17 2020, 18:24
jasonbcox requested review of this revision.Sep 17 2020, 18:24
jasonbcox added a child revision: D7479: [land-bot] Add an entry point for the land bot.Sep 17 2020, 18:35
Harbormaster completed remote builds in B12778: Diff 23562.Sep 17 2020, 18:43
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
jasonbcox updated this revision to Diff 23588.Sep 18 2020, 16:26

Add explicit check that HEAD has no changes from master

Harbormaster completed remote builds in B12800: Diff 23588.Sep 18 2020, 16:42
deadalnix accepted this revision.Sep 18 2020, 23:20
This revision is now accepted and ready to land.Sep 18 2020, 23:20
Closed by commit rABC9acea42cd09f: [land-bot] Fix git HEAD after checking revision (authored by jasonbcox). · Explain WhySep 19 2020, 00:12
This revision was automatically updated to reflect the committed changes.
jasonbcox added a commit: rABC9acea42cd09f: [land-bot] Fix git HEAD after checking revision.

Revision Contents
Changeset List

PathSize
contrib/
source-control-tools/
8 lines

Diff 23601

View Options

contrib/source-control-tools/apply-revision.sh

Loading...