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

git: fix discard all for unstaged files #11677

Merged
merged 1 commit into from
Sep 19, 2022
Merged

Conversation

vince-fugnitto
Copy link
Member

What it does

Fixes: #11675.

The pull-request fixes discard all when there are unstaged files.
The previous logic would not filter the newly created files, and throw dugite errors.

How to test

  1. start the application with a workspace under version control
  2. perform changes in the workspace including creating new files (unstaged)
  3. perform discard all from the scm-view
  4. confirm that the changes are discarded, and no errors are thrown

Review checklist

Reminder for reviewers

Signed-off-by: vince-fugnitto [email protected]

The commit fixes `discard all` for new files (unstaged).

Signed-off-by: vince-fugnitto <[email protected]>
@vince-fugnitto vince-fugnitto added the git issues related to git label Sep 16, 2022
@vince-fugnitto vince-fugnitto self-assigned this Sep 16, 2022
@msujew msujew self-requested a review September 16, 2022 15:02
Copy link
Member

@msujew msujew left a comment

Choose a reason for hiding this comment

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

I can confirm that the issue appears on master and is addressed by your changes 👍

@vince-fugnitto vince-fugnitto merged commit 99edac2 into master Sep 19, 2022
@vince-fugnitto vince-fugnitto deleted the vf/discard-all branch September 19, 2022 16:16
@github-actions github-actions bot added this to the 1.30.0 milestone Sep 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
git issues related to git
Projects
None yet
Development

Successfully merging this pull request may close these issues.

git: error when performing discard all on unstaged files
2 participants