Page MenuHomePhabricator

Improve git-subtree-check.sh
AbandonedPublic

Authored by Fabien on Wed, Aug 28, 09:02.

Details

Reviewers
deadalnix
Group Reviewers
Restricted Project
Summary
We have several pieces of information about subtrees:
1) What their current directory contents is
2) What their directory contents was at the time of the last subtree
merge
3) What the directory contents of the upstream project is in the commit
referred to by the subtree merge.

Normally, all 3 should be identical. git-subtree-check.sh so far only
compared (1) with (3) however.

Fix this by comparing all three, and give some more useful diff output
in the case of mismatch.

The added benefit is that (1) and (2) can be compared without needing to
see the upstream repository.

Backport of core PR11394
https://github.com/bitcoin/bitcoin/pull/11394/files

Test Plan

Run the git-subtree-check.sh script. Note that it will not output
GOOD as all our subtree libraries have been modified, at least for
code formatting.

Diff Detail

Repository
rABC Bitcoin ABC
Branch
PR11394
Lint
Lint OK
Unit
No Unit Test Coverage
Build Status
Buildable 7255
Build 12555: Bitcoin ABC Teamcity Staging
Build 12554: arc lint + arc unit

Event Timeline

Fabien created this revision.Wed, Aug 28, 09:02
Herald added a reviewer: Restricted Project. · View Herald TranscriptWed, Aug 28, 09:02
deadalnix requested changes to this revision.Wed, Aug 28, 12:24

I don't think it make sense to keep that script around for a us as we do not use git subtrees. Why not just delete it?

This revision now requires changes to proceed.Wed, Aug 28, 12:24
Fabien abandoned this revision.Wed, Aug 28, 12:28

Fair enough, we can still pull it again later if we want to use the subtrees. I will remove it.