-
-
Notifications
You must be signed in to change notification settings - Fork 742
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
ICU-21427 Don't ignore already checked-in files under "tools/cldr/lib". #1500
Merged
jefgen
merged 1 commit into
unicode-org:master
from
jefgen:user/jefgen/ICU-21427_gitignore
Jan 20, 2021
Merged
ICU-21427 Don't ignore already checked-in files under "tools/cldr/lib". #1500
jefgen
merged 1 commit into
unicode-org:master
from
jefgen:user/jefgen/ICU-21427_gitignore
Jan 20, 2021
Conversation
This file contains 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
daniel-ju
previously approved these changes
Dec 7, 2020
5 tasks
markusicu
previously approved these changes
Jan 19, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
srl295
previously approved these changes
Jan 19, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#1533 has additional comments
Co-authored-by: Victor Chang <vichang@google.com>
jefgen
force-pushed
the
user/jefgen/ICU-21427_gitignore
branch
from
January 19, 2021 22:52
5f5a5c5
to
4ac4773
Compare
Notice: the branch changed across the force-push!
~ Your Friendly Jira-GitHub PR Checker Bot |
daniel-ju
approved these changes
Jan 20, 2021
jefgen
added a commit
to microsoft/icu
that referenced
this pull request
Jan 20, 2021
…/lib" Cherry-picked from: unicode-org/icu#1500 ICU Ticket: https://unicode-org.atlassian.net/browse/ICU-21427
jefgen
added a commit
to microsoft/icu
that referenced
this pull request
Jan 20, 2021
This change cherry-picks two tickets from the upstream ICU repo that were merged after the ICU 68.2 release. - ICU-21427 Don't ignore already checked-in files under "tools/cldr/lib" - ICU-21118 check that dst and src are not null in uprv_memcpy The first one I had already done with #52, so this is mostly just making an update for the comments and to record it in the `changelog.md` file. The second one was fixed by @erik0686, and prevents undefined behavior in `ultag_parse`. CP: ICU-21118 check that dst and src are not null in uprv_memcpy https://unicode-org.atlassian.net/browse/ICU-21118 unicode-org/icu#1489 CP: ICU-21427 Don't ignore already checked-in files under "tools/cldr/lib" https://unicode-org.atlassian.net/browse/ICU-21427 unicode-org/icu#1500 Update changelog.md for cherry-picked tickets.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I recently ran into trouble trying to mirror/copy files from one ICU clone to another clone due to there being already checked-in files that were ignored by the
.gitignore
file undertools/cldr
The problem is that it excludes everything under the lib folder:
However, there are 3 checked in files in that folder which likely shouldn't be
gitignored
:The
README.txt
file is already excluded by the.gitignore
file:We should likely add the other two files to the
.gitignore
file as well.Checklist