Repository navigation
Make the terms in LICENSE match the Apache License 2.0 text word for word (#60) - #61
Merged
Merged
Conversation
…word (#60) The definition of "Contribution" in LICENSE read "submitted to the Licensor for inclusion in the Work", where the Apache License 2.0 text published at https://www.apache.org/licenses/LICENSE-2.0.txt reads "submitted to Licensor for inclusion in the Work". The extra "the" is gone. A diff of the published file against LICENSE now shows only the blank first line of the published file and its appendix, which LICENSE replaces with the project's copyright line. TestLicenseTermsMatchTheApacheLicense in cmd/cryptoscan compares the words of the terms in LICENSE, up to END OF TERMS AND CONDITIONS, with cmd/cryptoscan/testdata/apache-2.0.txt, a copy of the published file whose SHA-256 it checks first, and names the line of the first word that differs. Before the fix it failed at LICENSE:51; it now passes after comparing 1413 words. TestLicenseTermsProblem runs the comparison on six short texts, among them a word added, changed or left out and the same words wrapped differently. Fixes #60
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This pull request lands 1 commit in
LICENSE,CHANGELOG.mdandcmd/cryptoscan.Included
Verified on this exact tree
go build ./...: exit 0go vet ./...: exit 0, no outputgofmt -l cmd internal pkg: no outputgolangci-lint run ./...(golangci-lint 2.12.2): 21 issues (errcheck 15, staticcheck 6); the same command onorigin/main(6defd4a) in a detached worktree prints the same 21 issues, so they are pre-existinggo test -race -p 4 -count=1 -json ./...: exit 0; 9 packages, 8okand 1[no test files](pkg/version); counted from its testpass,failandskipevents, 1176 tests passed (370 top-level tests, 806 subtests), 0 failed, 0 skippedgit ls-files '*_test.go' | wc -l: 61TestLicenseTermsMatchTheApacheLicensein that run loggedcompared 1413 words of the terms in LICENSENot included
None
Closes
Fixes #60
How to merge
Rebase and merge, so that each change stays its own commit on
main.