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

feat: safer handling of partially staged files #29

Merged
merged 1 commit into from May 18, 2018

Conversation

mpareja
Copy link
Contributor

@mpareja mpareja commented May 18, 2018

  • Partially staged files are not re-staged

  • Non-zero exit code upon reformatting partially staged file

  • Update README

(From the README: Partially staged files will not be re-staged after formatting and pretty-quick will exit with a non-zero exit code. The intent is to abort the git commit and allow the user to amend their selective staging to include formatting fixes.)

+ Partially staged files are not re-staged

+ Non-zero exit code upon reformatting partially staged file

+ Update README
onWriteFile: file => {
console.log(`✍️ Fixing up ${chalk.bold(file)}.`);
},
})
);

console.log('✅ Everything is awesome!');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh no, everything is no longer unconditionally awesome 😱

@azz azz merged commit cc69fb3 into prettier:master May 18, 2018
@azz
Copy link
Member

azz commented May 18, 2018

This seems like an approach worth trying. Thanks for implementing it!

@azz
Copy link
Member

azz commented May 18, 2018

@mpareja
Copy link
Contributor Author

mpareja commented May 18, 2018

Sweet, thanks for the pretty-quick turnaround!

@mpareja mpareja deleted the partial-stage branch May 18, 2018 15:05
azz added a commit that referenced this pull request May 21, 2018
mpareja pushed a commit to mpareja/pretty-quick that referenced this pull request May 22, 2018
+ Partially staged files are not re-staged

+ Non-zero exit code upon reformatting partially staged file

+ Update README
azz pushed a commit that referenced this pull request May 22, 2018
* feat: safer handling of partially staged files (#29)

+ Partially staged files are not re-staged

+ Non-zero exit code upon reformatting partially staged file

+ Update README

* Fixes #30 handling of partially staged files

The git command checking for unstaged changes should not have been including a revision.
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.

None yet

2 participants