Move prepush scripts to precommit #3026
Merged
Conversation
This file contains hidden or 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
Feiyang1
reviewed
May 6, 2020
tools/gitHooks/license.js
Outdated
| @@ -115,26 +115,24 @@ async function doLicenseCommit(changedFiles) { | |||
| symbol: '✅' | |||
| }); | |||
|
|
|||
| const hasDiff = await git.diff(); | |||
| // Diff unstaged (prettier writes) against staged. | |||
tools/gitHooks/precommit.js
Outdated
| @@ -59,7 +82,18 @@ $ git stash pop | |||
| await doLicenseCommit(changedFiles); | |||
|
|
|||
| // Generate API reports | |||
| await doApiReportsCommit(); | |||
| await doApiReportsCommit(changedFiles); | |||
There was a problem hiding this comment.
Remove Commit from the function names?
|
|
||
| // Diff staged changes against last commit. Don't do an empty commit. | ||
| const postDiff = await git.diff(['--cached']); | ||
| if (!postDiff) { |
There was a problem hiding this comment.
It seems this condition will never be true since we are committing something from the staging area to begin with.
There was a problem hiding this comment.
There is a case I ran into while testing where if you only make formatting changes, and they are wrong, and Prettier reformats them back the way they were, there is no longer a diff between your changes and the last commit. I don't think this would ever happen on push but it could happen on a small commit if you did a lot of undos and don't realize the only remaining changes are formatting.
|
Removed API report step because it has been removed in #3030 |
Fetch master branch before diffing Each process diff unstaged against staged Make sure API report uses same diff Revert firestore file Restore merge-base behavior Clearer comment
Feiyang1
approved these changes
May 7, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Moved prepush scripts (prettier, license, api-report) to run on precommit. Since they now run on staged and not committed files, they only
git addand do not create commits. Some changes have been made to properly diff staged files against master, or staged files against unstaged files, as appropriate.Also attempts to fetch
origin/masterbefore diffing to reduce anomalies caused by stale clones.