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.

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

Avoid using uninitialized variables in format_tracking_info() #373

Merged
merged 1 commit into from
Jun 11, 2021
Merged

Avoid using uninitialized variables in format_tracking_info() #373

merged 1 commit into from
Jun 11, 2021

Conversation

dscho
Copy link
Member

@dscho dscho commented Jun 10, 2021

This is a companion to gitgitgadget#974, and might provide a "better" fix.

@dscho
fixup! Trace2:gvfs:experiment: capture more 'tracking' details
cd4928c 
Let's only use the `ours` and `theirs` variables if they are
initialized, i.e. when `stat_tracking_info()` returned without error.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho dscho requested a review from derrickstolee June 10, 2021 09:19
@dscho dscho enabled auto-merge June 10, 2021 10:23
@derrickstolee
Copy link
Collaborator

Do you want to remove the fixup! part of this commit and just submit it as a replacement? I won't mind.

@dscho
Copy link
Member Author

dscho commented Jun 11, 2021

Do you want to remove the fixup! part of this commit and just submit it as a replacement? I won't mind.

This fixup! was intended to help us fold the fix into the original patch next time we rebase microsoft/git.

And since the patch is only in microsoft/git, I do not want to submit the fixup to the Git mailing list ;-)

derrickstolee
derrickstolee approved these changes Jun 11, 2021
View reviewed changes
Copy link
Collaborator

@derrickstolee derrickstolee left a comment

Choose a reason for hiding this comment

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

I was really late in getting to the relevant messages on-list. Thanks for handling this!

@dscho dscho merged commit 2f9b245 into microsoft:vfs-2.32.0 Jun 11, 2021
@dscho dscho deleted the avoid-using-uninitialized-vars branch June 14, 2021 16:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@derrickstolee derrickstolee derrickstolee approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dscho @derrickstolee