Repository navigation
Remove the extra "the" from the Contribution definition in LICENSE, so its terms match the Apache License 2.0 word for word (#60) - #62
Merged
Conversation
…o its terms match the Apache License 2.0 word for word (#60) LICENSE line 51, in the definition of Contribution, read "submitted to the Licensor for inclusion in the Work by the copyright owner". The Apache License 2.0 text at https://www.apache.org/licenses/LICENSE-2.0.txt reads "submitted to Licensor for inclusion in the Work by the copyright owner" on its line 52. The extra "the" is removed. A diff of that text, fetched on 2026-10-17, against LICENSE now shows two differences: the blank first line of the Apache text, and its appendix, in place of which LICENSE holds the project's copyright line and the notice the appendix gives. TestLicenseHoldsTheApacheLicenseTermsWordForWord compares the words of LICENSE, from its first line through END OF TERMS AND CONDITIONS, with the same part of cmd/cryptodeps/testdata/apache-license-2.0.txt, a byte-for-byte copy of that text. Line breaks and indentation are not compared. Before the change it fails with (path shown from the repository root) LICENSE:51 reads "intentionally submitted to the Licensor for inclusion" where the Apache License 2.0 (cmd/cryptodeps/testdata/apache-license-2.0.txt:52) reads "intentionally submitted to Licensor for inclusion in" and it passes after. 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/cryptodeps.Included
Verified on this exact tree
go build ./...: exit 0, no outputgo vet ./...: exit 0, no outputgolangci-lint run ./...(make lint): golangci-lint 2.12.2 exits 3 withcan't load config: unsupported version of the configuration: ""; PRE-EXISTING: the same exit code and error onorigin/main(224f6ed), run in a separate worktreegolangci-lint run --no-config --new-from-rev=origin/main ./...:0 issues.go test -p 4 -race -count=1 -json ./...: exit 0; packages: 13 ok, 0 failed, 3 with no test files; top-level tests: 529 passed, 0 failed, 1 skipped (TestIntegration_FetchPyPIPackage:pip not available, skipping test); including subtests: 1628 passed, 0 failed, 1 skippedNot included
None
Closes
Fixes #60
How to merge
Rebase and merge, so that each change stays its own commit on
main.