Skip to content

Add git-subtree-check.sh script #5965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
laanwj merged 1 commit into from
Apr 8, 2015
Merged

Add git-subtree-check.sh script #5965

laanwj merged 1 commit into from
Apr 8, 2015

Conversation

@sipa
Copy link
Member

@sipa sipa commented Apr 3, 2015

As suggested in #5952: a script to verify that subtree contents matches upstream subtree.

@fanquake
Copy link
Member

fanquake commented Apr 5, 2015

Testing. @sipa Does this match what you'd expect to see?

bash-3.2$ contrib/devtools/git-subtree-check.sh src/secp256k1
src/secp256k1 in HEAD was last updated to upstream commit 50cc6ab0625efda6dddf1dc86c1e2671f069b0d8 (tree 3b675a638355f8ccad0474900fed0bffcda8e62a)
src/secp256k1 in HEAD currently refers to tree 3b675a638355f8ccad0474900fed0bffcda8e62a
GOOD
bash-3.2$ contrib/devtools/git-subtree-check.sh src/leveldb
src/leveldb in HEAD was last updated to upstream commit 7d41e6f89ff04ce9e6a742932924796f69c6e23d (tree ab3e90ac840140eb5bec8a5c69bf890162a43941)
src/leveldb in HEAD currently refers to tree ab3e90ac840140eb5bec8a5c69bf890162a43941
GOOD

@sipa
Copy link
Member Author

sipa commented Apr 5, 2015

You indeed expect it to say 'GOOD'.

Note that it will fail for src/secp256k1 in 0.10, as that has local modifications on top of the upstream import.

@laanwj laanwj added the Docs label Apr 8, 2015
@laanwj laanwj merged commit 5ff94c6 into bitcoin:master Apr 8, 2015
laanwj added a commit that referenced this pull request Apr 8, 2015
@laanwj
Merge pull request #5965
7c6bfb1 
5ff94c6 Add git-subtree-check.sh script (Pieter Wuille)
@laanwj laanwj mentioned this pull request Apr 8, 2015
Merged
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

Docs

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@sipa @fanquake @laanwj