Make copyright header lines uniform #8675

pull isle2983 wants to merge 1 commits into bitcoin:master from isle2983:copyright-made-uniform changing 19 files +19 −19

isle2983 commented at 2:10 AM on September 7, 2016: contributor

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 added the label Docs and Output on Sep 7, 2016
fanquake commented at 2:12 AM on September 7, 2016: member

Please squash these into a single commit.
dcousens commented at 2:53 AM on September 7, 2016: contributor

trivial ACK
isle2983 force-pushed on Sep 8, 2016
isle2983 commented at 1:33 AM on September 8, 2016: contributor

I have squashed the three into one commit.
in src/univalue/test/unitester.cpp:None in 0d411d3298 outdated
```
   0 | @@ -1,4 +1,4 @@
   1 | -// Copyright 2014 BitPay Inc.
```
MarcoFalke commented at 9:29 AM on September 8, 2016:

univalue is a subtree. You'd need to change it upstream.
isle2983 force-pushed on Sep 9, 2016
isle2983 commented at 1:43 AM on September 9, 2016: contributor

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 commented at 3:14 AM on September 9, 2016: member

ACK b0cc47d
MarcoFalke commented at 3:06 PM on September 19, 2016: member

ACK b0cc47d
paveljanik commented at 9:16 PM on October 21, 2016: contributor

Needs rebase
fanquake commented at 12:46 PM on November 6, 2016: member

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

[copyright] copyright header style uniform

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.

4b04e32c20

isle2983 force-pushed on Nov 6, 2016
isle2983 commented at 5:20 PM on November 6, 2016: contributor

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 merged this on Nov 7, 2016
laanwj closed this on Nov 7, 2016
laanwj referenced this in commit 44f2df613f on Nov 7, 2016
codablock referenced this in commit 9d661f4337 on Jan 13, 2018
andvgal referenced this in commit 08a4271239 on Jan 6, 2019
CryptoCentric referenced this in commit 66743645de on Feb 15, 2019
DrahtBot locked this on Sep 8, 2021

Contributors

Labels