Fix "--diff implies --no-stash" feature
#1303
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
elias-pap
changed the title
--diff implies --no-stash" feature
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
iiroj
requested changes
Jun 26, 2023
iiroj
reviewed
Jun 26, 2023
elias-pap
force-pushed
the
fix-diff-no-stash
branch
from
d79eb83
to
004945e
Compare
elias-pap
force-pushed
the
fix-diff-no-stash
branch
from
4641c36
to
6320e92
Compare
This reverts commit 004945e.
elias-pap
commented
Jun 27, 2023
Codecov ReportPatch and project coverage have no change.
Additional details and impacted files@@ Coverage Diff @@
## master #1303 +/- ##
=========================================
Coverage 100.00% 100.00%
=========================================
Files 26 26
Lines 740 740
Branches 198 198
=========================================
Hits 740 740 ☔ View full report in Codecov by Sentry. |
iiroj
reviewed
Jun 28, 2023
iiroj
approved these changes
Jun 28, 2023
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.
closes #1279
Related work: #1250, #1259.
Current result
When only
--diffis passed,--stashis stilltrue. It is set at line 65, stored in options at line 105 and passed to index.js at line 127.Expected result
When only
--diffis passed,--stashshould befalse.