- add missing header end comments
- ensure alphabetical ordering
- update copyright year and license
cleanup new script files (no code changes) #4881
pull Diapolo wants to merge 1 commits into bitcoin:master from Diapolo:cleanup_script changing 13 files +34 −33-
Diapolo commented at 8:04 am on September 9, 2014: none
-
jtimon commented at 8:32 am on September 9, 2014: contributorI was only fixing the makefile in #4755 and @TheBlueMatt already nit it, hehe. I’m fine with doing this separately, untested ack (nothing to test, really). I’ll put more attention into these details the next time. Maybe this is the right place for a clang commit on the new files?
-
sipa commented at 8:56 am on September 9, 2014: memberCan we change the license of existing code?
-
laanwj commented at 9:02 am on September 9, 2014: memberAs discussed before we’re not changing the license, just clarifying it.
-
Diapolo commented at 9:03 am on September 9, 2014: none@sipa Dunno, @TheBlueMatt suggested this and I just included it, because this is a seperate folder anyway (
script/
). -
laanwj commented at 9:04 am on September 9, 2014: memberACK anyhow.
-
sipa commented at 9:06 am on September 9, 2014: memberI thought we weren’t sure about legality of changing the license (even just the name) of existing code, but were going to use MIT (without X11) in new code only. I don’t care either way - just want to make sure we know what we’re doing.
-
jtimon commented at 9:42 am on September 9, 2014: contributorThe latest license discussion was in #4832. What I do by default is copying the license from another file (and I suspect most people do this same thing), so whatever license it is, we may want to merge something like #4832 once instead of having this discussion every time someone creates a new file just copying the license. I think I would do the same with little corrections like the missing comment at the end of the #endif of the .h file. These mistakes are much harder to be repeated if people use existing files as templates and we already have what we want in existing files. Although a PR fixing all licenses and endif comments will likely touch many files, it will probably merge cleanly with any other changes in the same files.
And although a PR fixing all alphabetic orderings is more likely to produce conflicts you may want to do it once and police that nobody breaks it from then on as well. At least I wouldn’t oppose to it. I know these things aren’t high priority, I’m just expressing my preference to fix these things at once over fixing it little by little first in new files and then in many small PRs or included in other PRs that are touching those parts of the code anyway like with clang formatting. -
sipa commented at 2:16 pm on September 9, 2014: memberACK
-
Diapolo commented at 10:19 am on September 14, 2014: noneAnything left that needs to be done here to help speed up merge? I rebased to catch the new wallet_ismine changes.
-
cleanup new script files (no code changes)
- add missing header end comments - ensure alphabetical ordering - update copyright year and license
-
BitcoinPullTester commented at 10:52 am on September 14, 2014: noneAutomatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/p4881_2d79bba36b028dd803fb17124420b9d209b842b6/ for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
-
jtimon commented at 9:46 pm on September 14, 2014: contributorI don’t think so, it looks good to me as it is.
-
sipa merged this on Sep 14, 2014
-
sipa closed this on Sep 14, 2014
-
sipa referenced this in commit 512fcbcb19 on Sep 14, 2014
-
Diapolo deleted the branch on Sep 15, 2014
-
MarcoFalke locked this on Sep 8, 2021
github-metadata-mirror
This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-11-17 18:12 UTC
This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-11-17 18:12 UTC
This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me
More mirrored repositories can be found on mirror.b10c.me