-
-
Notifications
You must be signed in to change notification settings - Fork 83
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: --no-restage flag for skipping re-stage step in staged mode (#39) #40
Merged
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
Oops, mis-typed the name of the flag in the docs. I'll force push the corrected version. |
benwiley4000
changed the title
feat: --no-stage flag for skipping re-stage step in staged mode (#39)
feat: --no-restage flag for skipping re-stage step in staged mode (#39)
Sep 18, 2018
benwiley4000
force-pushed
the
no-restage
branch
from
September 18, 2018 04:07
e658ebc
to
663e5a7
Compare
All good now! |
Looks like the tests fail now. Could you investigate that, and also add a new test for this flag?
|
Oops! I'll check it out, thanks for flagging.
Le mar. 18 sept. 2018 06 h 04, Lucas Azzola <notifications@github.com> a
écrit :
… Looks like the tests fail now. Could you investigate that, and also add a
new test for this flag?
FAILsrc/__tests__/scm-git.test.js
●with git › with --staged stages fully-staged files
expect(jest.fn()).toHaveBeenCalledWith(expected)
Expected mock function to have been called with:
["add", "./raz.js"] as argument 2, but it was called with["ls-files", "--others", "--exclude-standard"].
["add", "./raz.js"] as argument 2, but it was called with["diff", "--name-only", "--diff-filter=ACMRTUB"].
["add", "./raz.js"] as argument 2, but it was called with["diff", "--name-only", "--cached", "--diff-filter=ACMRTUB", "banana"].
172 | prettyQuick('root' { since:'banana' staged:true });
173 |
> 174 | expect(execa.sync).toHaveBeenCalledWith('git' ['add''./raz.js'] {
175 | cwd:'/'
176 | });
177 | expect(execa.sync).not.toHaveBeenCalledWith('git' ['add''./foo.md'] {
at Object.test (src/__tests__/scm-git.test.js:174:34)
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#40 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AM7h7c_2GjqCaoZq49thlOqMAGQ9rLdlks5ucMU8gaJpZM4WtID3>
.
|
@azz I made a fix to pass the failing test, added a new test, and a commit at the end to change "foo.md" to "foo.js" since I assumed that was a typo. If not, I can get rid of that commit. |
azz
approved these changes
Sep 19, 2018
Thanks! |
Thank you! :) |
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.
Fixes #39