Skip to content

Update Git to include status deserialize fix #1300

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.

Sign up for GitHub

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

Jump to bottom
Merged
derrickstolee merged 2 commits into from
Jul 1, 2019
Merged

Update Git to include status deserialize fix #1300

derrickstolee merged 2 commits into from
Jul 1, 2019

Conversation

@derrickstolee
Copy link
Contributor

@derrickstolee derrickstolee commented Jun 26, 2019 •
edited
Loading

Includes status deserialziation bug fix from microsoft/git#157.

Further, update the dehydrate verb to specifically use -uall when checking for local changes.

@derrickstolee derrickstolee added this to the M155 milestone Jun 26, 2019
@derrickstolee
Update Git to include status deserialization fix
c86e82b 
Includes status deserialziation bug fix from microsoft/git#157.
@derrickstolee derrickstolee changed the title Update Git [PR Build] Update Git to include status deserialize fix Jun 26, 2019
@derrickstolee derrickstolee marked this pull request as ready for review June 26, 2019 18:19
@derrickstolee derrickstolee requested a review from kewillford June 26, 2019 18:31
@kewillford
Copy link
Member

kewillford commented Jun 26, 2019

We will need the changes in this commit so that if a user has the config for status.showUntrackedFiles set to no, they will be able to dehydrate when they have a clean working tree since a bare git status will now have nothing to commit (use -u to show untracked files) even when the working directory is clean and it is looking for nothing to commit, working tree clean.

@derrickstolee
Copy link
Contributor Author

derrickstolee commented Jun 26, 2019

We will need the changes in this commit so that if a user has the config for status.showUntrackedFiles set to no, they will be able to dehydrate when they have a clean working tree since a bare git status will now have nothing to commit (use -u to show untracked files) even when the working directory is clean and it is looking for nothing to commit, working tree clean.

I did a cherry-pick, but dropped the change to IncludeVerb as I did that. Hopefully that's what you need.

@derrickstolee derrickstolee merged commit 6ef5877 into master Jul 1, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jeffhostetler jeffhostetler Awaiting requested review from jeffhostetler

1 more reviewer

@kewillford kewillford kewillford approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

affects: correctness domain: git type: bug

Projects

None yet

Milestone

M155

Development

Successfully merging this pull request may close these issues.

3 participants

@derrickstolee @kewillford