Skip to content

Make copyright header lines uniform #8675

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
merged 1 commit into from
Nov 7, 2016
Merged

Make copyright header lines uniform #8675

merged 1 commit into from
Nov 7, 2016

Conversation

isle2983
Copy link
Contributor

@isle2983 isle2983 commented Sep 7, 2016

Fixes a few instances of copyright headers deviating from the norm as
discovered using the copyright_header_report.py script that was introduced in the previous PR

@fanquake fanquake added the Docs label Sep 7, 2016
@fanquake
Copy link
Member

fanquake commented Sep 7, 2016

Please squash these into a single commit.

@dcousens
Copy link
Contributor

dcousens commented Sep 7, 2016

trivial ACK

@isle2983 isle2983 force-pushed the copyright-made-uniform branch from d0cd131 to 0d411d3 Compare September 8, 2016 01:24
@isle2983
Copy link
Contributor Author

isle2983 commented Sep 8, 2016

I have squashed the three into one commit.

maflcko
maflcko reviewed Sep 8, 2016
View reviewed changes
src/univalue/test/unitester.cpp
@@ -1,4 +1,4 @@
// Copyright 2014 BitPay Inc.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

univalue is a subtree. You'd need to change it upstream.

@isle2983 isle2983 force-pushed the copyright-made-uniform branch from 0d411d3 to b0cc47d Compare September 9, 2016 01:41
@isle2983
Copy link
Contributor Author

isle2983 commented Sep 9, 2016

Thanks @MarcoFalke. I have dropped the changes from src/univalue/* here and I have submitted them as a PR to @jgarzik's main univalue repo.

@fanquake
Copy link
Member

fanquake commented Sep 9, 2016

ACK b0cc47d

1 similar comment
@maflcko
Copy link
Member

maflcko commented Sep 19, 2016

ACK b0cc47d

@paveljanik
Copy link
Contributor

Needs rebase

@fanquake
Copy link
Member

fanquake commented Nov 6, 2016

@isle2983 Can you rebase this so it can be merged?

@isle2983
[copyright] copyright header style uniform
4b04e32 
Three categories of modifications:

1)

1 instance of 'The Bitcoin Core developers \n',
1 instance of 'the Bitcoin Core developers\n',
3 instances of 'Bitcoin Core Developers\n', and
12 instances of 'The Bitcoin developers\n'

are made uniform with the 443 instances of 'The Bitcoin Core developers\n'

2)

3 instances of 'BitPay, Inc\.\n' are made uniform with the other 6
instances of 'BitPay Inc\.\n'

3)

4 instances where there was no '(c)' between the 'Copyright' and the year
where it deviates from the style of the local directory.
@isle2983 isle2983 force-pushed the copyright-made-uniform branch from b0cc47d to 4b04e32 Compare November 6, 2016 17:13
@isle2983
Copy link
Contributor Author

isle2983 commented Nov 6, 2016

rebased and conflicts resolved in four files

src/policy/policy.cpp - The conflict was with date being bumped to '2016' by a prior commit on the same line as this pull's edit.

src/policy/policy.h - same as with policy.cpp

src/test/bctest.py - The conflict was with a new 'The Bitcoin Core developers' copyright holder was added in the adjacent line to my edit where the comma was removed after 'BitPay'.

src/test/bitcoin-util-test.py - same as with bctest.py

@laanwj laanwj merged commit 4b04e32 into bitcoin:master Nov 7, 2016
laanwj added a commit that referenced this pull request Nov 7, 2016
@laanwj
Merge #8675: Make copyright header lines uniform
44f2df6 
4b04e32 [copyright] copyright header style uniform (isle2983)
codablock pushed a commit to codablock/dash that referenced this pull request Jan 13, 2018
@laanwj @codablock
Merge bitcoin#8675: Make copyright header lines uniform
9d661f4 
4b04e32 [copyright] copyright header style uniform (isle2983)
andvgal pushed a commit to energicryptocurrency/gen2-energi that referenced this pull request Jan 6, 2019
@laanwj @andvgal
Merge bitcoin#8675: Make copyright header lines uniform
08a4271 
4b04e32 [copyright] copyright header style uniform (isle2983)
CryptoCentric pushed a commit to absolute-community/absolute that referenced this pull request Feb 15, 2019
@laanwj @CryptoCentric
Merge bitcoin#8675: Make copyright header lines uniform
6674364 
4b04e32 [copyright] copyright header style uniform (isle2983)
@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.
6 participants
@isle2983 @fanquake @dcousens @maflcko @paveljanik @laanwj