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.

Sign up for GitHub

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

Jump to bottom

replace-fork should not clear uncommitted changes #22348

Merged
merged 1 commit into from
Sep 20, 2021
Merged

replace-fork should not clear uncommitted changes #22348

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 18 additions & 6 deletions scripts/merge-fork/replace-fork.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,27 @@ async function main() {
await Promise.all(oldFilenames.map(unforkFile));

// Use ESLint to autofix imports
const spawn = spawnSync('yarn', ['linc', '--fix'], {
spawnSync('yarn', ['linc', '--fix'], {
stdio: ['inherit', 'inherit', 'pipe'],
});
if (spawn.stderr.toString() !== '') {
spawnSync('git', ['checkout', '.']);
// TODO: If eslint crashes, it may not have successfully fixed all
// the imports, which would leave the reconciler files in an inconsistent
// state. So we used to crash and reset the working directory. But that
// solution assumed that the working directory was clean before you run the
// command — if it wasn't, it'll not only reset the synced reconciler files,
// but all the other uncommitted changes.
//
// We need a different strategy to prevent loss of work. For example, we could
// exit early if the working directory is not clean before you run the script.
//
// Until we think of something better, I've commmented out this branch to
// prevent work from accidentally being lost.
// if (spawn.stderr.toString() !== '') {
// spawnSync('git', ['checkout', '.']);

console.log(Error(spawn.stderr));
process.exitCode = 1;
}
// console.log(Error(spawn.stderr));
// process.exitCode = 1;
// }
}

async function unforkFile(oldFilename) {
Expand Down