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: --no-restage flag for skipping re-stage step in staged mode (#39) #40

Merged
merged 4 commits into from Sep 19, 2018

Conversation

benwiley4000
Copy link
Contributor

@benwiley4000 benwiley4000 commented Sep 18, 2018

Fixes #39

@benwiley4000
Copy link
Contributor Author

Oops, mis-typed the name of the flag in the docs. I'll force push the corrected version.

@benwiley4000 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
Copy link
Contributor Author

All good now!

@azz
Copy link
Member

azz commented Sep 18, 2018

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)

@benwiley4000
Copy link
Contributor Author

benwiley4000 commented Sep 18, 2018 via email

@benwiley4000
Copy link
Contributor Author

benwiley4000 commented Sep 18, 2018

@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 azz merged commit 230d03f into prettier:master Sep 19, 2018
@azz
Copy link
Member

azz commented Sep 19, 2018

Thanks!

@benwiley4000 benwiley4000 deleted the no-restage branch September 19, 2018 03:37
@benwiley4000
Copy link
Contributor Author

Thank you! :)

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