react-native-git-upgrade deletes my non-versioned files and fails

[antoinerousseau]

Description

I installed [email protected] and ran it on my project.

Reproduction

$ react-native-git-upgrade
git-upgrade info Check for updates
git-upgrade info Read package.json files
git-upgrade info Check declared version
git-upgrade info Check matching versions
git-upgrade info Check React peer dependency
git-upgrade info Check that Git is installed
git-upgrade info Get information from NPM registry
git-upgrade info Upgrading to React Native 0.41.2, React ~15.4.0
git-upgrade info Setup temporary working directory
git-upgrade info Configure Git environment
git-upgrade info Init Git repository
git-upgrade info Add all files to commit
git-upgrade info Commit current project sources
git-upgrade info Create a tag before updating sources
git-upgrade info Generate old version template
git-upgrade info Add updated files to commit
git-upgrade info Commit old version template
git-upgrade info Install the new version
npm WARN deprecated [email protected]: use uuid module instead
git-upgrade info Generate new version template
git-upgrade info Add updated files to commit
git-upgrade info Commit new version template
git-upgrade info Generate the patch between the 2 versions
git-upgrade info Save the patch in temp directory
git-upgrade info Reset the 2 temporary commits
git-upgrade info Apply the patch
fatal: unrecognized input
git-upgrade WARN The upgrade process succeeded but there might be conflicts to be resolved. See above for the list of files that have merge conflicts.
git-upgrade info Upgrade done
$

And in the end, no file is modified, and some files are missing, for example android/app/google-services.json (present in my .gitignore)

Solution

No idea

Additional Information

• React Native version: just installed 0.41.2, wanted to upgrade RN templates according to it
• Platform: n/a
• Operating System: macOS

Note: my Android/iOS package name is net.tribeez (my package.json name is tribeez)

[ncuillery]

Ok I reproduced the deletion by running the Git commands manually, just like the tool does: https://gist.github.com/ncuillery/4b09e36d772601301cf0d0c94dcde692. I think I got it:

The first step of the process consists in restoring the template of your current RN version, just like it would have been generated by the init command. So your .gitignore file is replaced by this one https://github.com/facebook/react-native/blob/master/local-cli/templates/HelloWorld/_gitignore for the rest of the process.

From now on, android/app/google-services.json is no longer ignored. So when the files are committed, it is considered as "added".

At the end, the git reset --hard command reverts the commit and logically deletes the file 😱

[koenpunt]

.env files also disappear, which I'm not happy about...

[jwarby]

Also lost some files which were .gitignore'd after using the upgrade tool... :disappointed:

[rdixonbhw]

I'm assuming the files it obliterates are just as gone as if I'd run rm on them? If so that's a pretty significant setback for me.

[hehex9]

react-native-git-upgrade deletes my jks file.
I just *

[didil]

same , some gitignored files get deleted and I have to find them in my backups, pretty annoying if you dont expect it ...

[joncursi]

Ditto. I use react-native-config to store environment variables for development, staging, and production. Git upgrade wipes out these files since they are not committed to github (contain secrets). Pain in the butt to have to replace them every month when a new RN version comes out.

[rdixonbhw]

I've started using rn-diff for upgrades, usually pretty quick and less frustrating to do it manually. https://github.com/ncuillery/rn-diff

[ujwal-setlur]

This is driving me nuts too! Every time I upgrade, my .env files and frameworks under ios/Frameworks are deleted (stuff under Frameworks is gitignore'd). First time build always fails before I remember to restore from backup...

Will check out https://github.com/ncuillery/rn-diff

[Robo-Rin]

Any update on this? Did you all end up switching to rn-diff?

[antoinerousseau]

@Hauuguu I did, yes

[MrToph]

Same here, just lost all my files that were gitignored ...

[stale[bot]]

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Maybe the issue has been fixed in a recent release, or perhaps it is not affecting a lot of people. If you think this issue should definitely remain open, please let us know why. Thank you for your contributions.

[joeybaker]

This is very much still happening to everyone who uses react-native-git-upgrade and uses a .gitignore.

[ujwal-setlur]

I stopped using react-native-git-upgrade in favor of rn-diff

[antoinerousseau]

Looks like https://github.com/facebook/react-native/commit/7492860 resolved this.