status: fix crash in git status --deserialize --verbose (based on v2.26)
#260
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
Fix crash in `git status -v` by setting `des_s->repo` to a non-null value. Upstream changes to eliminate use of `the_repository` added a `repo` field to `struct status`. And calls in `wt-status.c` to `repo_init_revisions()` were changed to pass `s->repo` rather than `the_repository`. The status deserialization code was not updated to actually set `s->repo` before common code passed the value to OID routines. This caused a segfault when verbose output was requested. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Disable deserialization when verbose output requested. Verbose mode causes Git to print diffs for modified files. This requires the index to be loaded to have the currently staged OID values. Without loading the index, verbose output make it look like everything was deleted. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Verify that `git status --deserialize=x -v` does not crash and generates the same output as a normal (scanning) status command. These issues are described in the previous 2 commits. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
jeffhostetler
requested review from
derrickstolee,
dscho,
jrbriggs and
kewillford
derrickstolee
added a commit
to derrickstolee/VFSForGit
that referenced
this pull request
Apr 13, 2020
See microsoft/git#260 for details. Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
dscho
approved these changes
Apr 13, 2020
derrickstolee
approved these changes
Apr 13, 2020
There was a problem hiding this comment.
The tests in microsoft/VFSForGit#1650 have passed except for a notoriously slow version. This is good to go.
dscho
pushed a commit
that referenced
this pull request
May 20, 2020
…alize-v226 status: fix crash in `git status --deserialize --verbose` (based on v2.26)
dscho
pushed a commit
that referenced
this pull request
May 20, 2020
…alize-v226 status: fix crash in `git status --deserialize --verbose` (based on v2.26)
derrickstolee
pushed a commit
that referenced
this pull request
Jun 1, 2020
derrickstolee
pushed a commit
that referenced
this pull request
Jul 20, 2020
derrickstolee
pushed a commit
that referenced
this pull request
Jul 27, 2020
derrickstolee
pushed a commit
that referenced
this pull request
Jul 28, 2020
derrickstolee
pushed a commit
that referenced
this pull request
Oct 6, 2020
derrickstolee
pushed a commit
that referenced
this pull request
Oct 6, 2020
derrickstolee
pushed a commit
that referenced
this pull request
Oct 9, 2020
derrickstolee
pushed a commit
that referenced
this pull request
Oct 9, 2020
derrickstolee
pushed a commit
that referenced
this pull request
Oct 16, 2020
derrickstolee
pushed a commit
that referenced
this pull request
Oct 19, 2020
jeffhostetler
pushed a commit
that referenced
this pull request
Aug 23, 2023
mjcheetham
pushed a commit
that referenced
this pull request
Jul 23, 2024
mjcheetham
pushed a commit
that referenced
this pull request
Jul 29, 2024
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.
Fix crash in
git status -vwhen using the serialization cache.This PR replaces #258 and is based upon v2.26, rather than v2.25 where it was originally reported.