Keep the ignored files during the upgrade process #17393
Closed
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
facebook-github-bot
added
the
CLA Signed
|
@facebook-github-bot label iOS @facebook-github-bot label Core Team Generated by 🚫 dangerJS |
janicduplessis
suggested changes
Jan 1, 2018
react-native-git-upgrade/cliEntry.js
Outdated
| await exec('git init', verbose); | ||
|
|
||
| log.info('Save current .gitignore file'); | ||
| await copyCurrentGitIgnoreFile(tmpDir); |
There was a problem hiding this comment.
copyCurrentGitIgnoreFile is not async so no need to use await here.
janicduplessis
approved these changes
Jan 1, 2018
|
Actually I can just fix it myself :) @facebook-github-bot shipit |
facebook-github-bot
added
Import Started
|
Something went wrong when importing this pull request. Please cc someone from the team at fb to help with importing this. |
|
cc @hramos |
facebook-github-bot
added
the
Import Started
facebook-github-bot
approved these changes
Jan 29, 2018
There was a problem hiding this comment.
@hramos is landing this pull request. If you are a Facebook employee, you can view this diff on Phabricator.
hramos
suggested changes
Jan 30, 2018
When the user adds new files to the .gitignore file, those files are deleted during the upgrade process because it starts by creating a fresh .gitignore file without user's modification. This commit adds a step to move the excluded file at the repository level so that they are kept ignored during the upgrade process.
ncuillery
force-pushed
the
git-upgrade/fix-deleted-ignored-files
branch
from
e474cad
to
ffdfceb
Compare
|
Rebase done @hramos |
facebook-github-bot
approved these changes
Feb 1, 2018
There was a problem hiding this comment.
@hramos is landing this pull request. If you are a Facebook employee, you can view this diff on Phabricator.
Plo4ox
pushed a commit
to Plo4ox/react-native
that referenced
this pull request
Feb 17, 2018
Summary: This PR fixes the issue facebook#12237 relative to react-native-git-upgrade. When the user adds new files to the .gitignore file, those files are deleted during the upgrade process because it starts by creating a fresh .gitignore file without user's modification, so the user's ignored files are no longer ignored and they are deleted during the upgrading process. The best solution I've found to keep the user's ignored files... ignored, consists in appending the content of the .gitignore file in the `<TEMP DIR>/.git-rn/info/exclude` file. The user's ignored files are now ignored at the repository level, they no longer interfere with the upgrade process. Reminder: The tool uses a temporary local Git repository generated on the fly, so we can do whatever we want in it. - Publish react-native-git-upgrade to sinopia - `npm install -g react-native-git-upgrade` - Init a new project with an old version: `react-native init MyApp --version=0.50.0` - Create a new file named `dummy-ignored-file.json` in the project's root - Append `dummy-ignored-file.json` to the `.gitignore` file - Run `react-native-git-upgrade` 👉 The `dummy-ignored-file.json` is not deleted. [CLI][BUGFIX][react-native-git-upgrade] - Keep the user's ignored files while upgrading <!-- Help reviewers and the release process by writing your own release notes **INTERNAL and MINOR tagged notes will not be included in the next version's final release notes.** CATEGORY [----------] TYPE [ CLI ] [-------------] LOCATION [ DOCS ] [ BREAKING ] [-------------] [ GENERAL ] [ BUGFIX ] [-{Component}-] [ INTERNAL ] [ ENHANCEMENT ] [ {File} ] [ IOS ] [ FEATURE ] [ {Directory} ] |-----------| [ ANDROID ] [ MINOR ] [ {Framework} ] - | {Message} | [----------] [-------------] [-------------] |-----------| [CATEGORY] [TYPE] [LOCATION] - MESSAGE EXAMPLES: [IOS] [BREAKING] [FlatList] - Change a thing that breaks other things [ANDROID] [BUGFIX] [TextInput] - Did a thing to TextInput [CLI] [FEATURE] [local-cli/info/info.js] - CLI easier to do things with [DOCS] [BUGFIX] [GettingStarted.md] - Accidentally a thing/word [GENERAL] [ENHANCEMENT] [Yoga] - Added new yoga thing/position [INTERNAL] [FEATURE] [./scripts] - Added thing to script that nobody will see --> Closes facebook#17393 Differential Revision: D6839856 Pulled By: hramos fbshipit-source-id: e4e9d759b59790e3cbc52408cef8314bf0a9c772
react-native-bot
removed
Import Started
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.
Motivation
This PR fixes the issue #12237 relative to react-native-git-upgrade.
When the user adds new files to the .gitignore file, those files are deleted during the upgrade process because it starts by creating a fresh .gitignore file without user's modification, so the user's ignored files are no longer ignored and they are deleted during the upgrading process.
The best solution I've found to keep the user's ignored files... ignored, consists in appending the content of the .gitignore file in the
<TEMP DIR>/.git-rn/info/excludefile.The user's ignored files are now ignored at the repository level, they no longer interfere with the upgrade process.
Reminder: The tool uses a temporary local Git repository generated on the fly, so we can do whatever we want in it.
Test Plan
npm install -g react-native-git-upgradereact-native init MyApp --version=0.50.0dummy-ignored-file.jsonin the project's rootdummy-ignored-file.jsonto the.gitignorefilereact-native-git-upgrade👉 The
dummy-ignored-file.jsonis not deleted.Release Notes
[CLI][BUGFIX][react-native-git-upgrade] - Keep the user's ignored files while upgrading