Skip to content
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.

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

simpleTestForGenerator/Apache-1.0: Add missing closing quote #2

Merged
merged 1 commit into from
Jan 22, 2018

Conversation

wking
Copy link

@wking wking commented Jan 22, 2018

Catching up with spdx/license-list-XML#588.

Catching up with spdx/license-list-XML@558562e6 (Add missing close
quote to Apache-1.0.xml, 2017-12-30, spdx/license-list-XML#588).
@wking wking force-pushed the apache-1.0-missing-quote branch from db2f66c to bee8966 Compare January 22, 2018 20:08
wking added a commit to wking/license-list-XML that referenced this pull request Jan 22, 2018
…losing quote)

Similar to 36bce3f (test: Add license-test-files with read-tree,
2018-01-03):

  $ git config remote.test.url https://github.com/wking/license-test-files
  $ git fetch test
  $ git merge -s ours --allow-unrelated-histories --no-commit test/apache-1.0-missing-quote
  $ git rm -r test
  $ git read-tree --prefix=test/ -u test/apache-1.0-missing-quote
  $ rm test/README.md test/testfiles-1.0-for-license-list-2.6.tar
  $ git add test

The remote.test.url update is because Gary hasn't landed my just-filed
[1].

The 'git rm' call avoids:

  $ git read-tree --prefix=test/ -u test/apache-1.0-missing-quote
  error: Entry 'test/simpleTestForGenerator/0BSD.txt' overlaps with 'test/simpleTestForGenerator/0BSD.txt'.  Cannot bind.

This catches the test data up with 558562e (Add missing close quote
to Apache-1.0.xml, 2017-12-30, spdx#588) and b975b3e (Remove section
4.g. from BitTorrent-1.0 license, 2017-12-30, spdx#589).

[1]: goneall/license-test-files#2
wking added a commit to wking/license-list-XML that referenced this pull request Jan 22, 2018
…losing quote)

Similar to 36bce3f (test: Add license-test-files with read-tree,
2018-01-03):

  $ git config remote.test.url https://github.com/wking/license-test-files
  $ git fetch test
  $ git rm -r test
  $ git read-tree --prefix=test/ -u test/apache-1.0-missing-quote
  $ rm test/README.md test/testfiles-1.0-for-license-list-2.6.tar
  $ git add test

The remote.test.url update is because Gary hasn't landed my just-filed
[1].

The 'git rm' call avoids:

  $ git read-tree --prefix=test/ -u test/apache-1.0-missing-quote
  error: Entry 'test/simpleTestForGenerator/0BSD.txt' overlaps with 'test/simpleTestForGenerator/0BSD.txt'.  Cannot bind.

This catches the test data up with 558562e (Add missing close quote
to Apache-1.0.xml, 2017-12-30, spdx#588) and b975b3e (Remove section
4.g. from BitTorrent-1.0 license, 2017-12-30, spdx#589).

[1]: goneall/license-test-files#2
@goneall goneall merged commit 38ca378 into goneall:master Jan 22, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants