status: deserialize with -uno does not print correct hint #157
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
With the "--untracked-files=complete" option status computes a superset of the untracked files. We use this when writing the status cache. If subsequent deserialize commands ask for either the complete set or one of the "no", "normal", or "all" subsets, it can still use the cache file because of filtering in the deserialize parser. When running status with the "-uno" option, the long format status would print a "(use -u to show untracked files)" hint. When deserializing with the "-uno" option and using a cache computed with "-ucomplete", the "nothing to commit, working tree clean" message would be printed instead of the hint. It was easy to miss because the correct hint message was printed if the cache was rejected for any reason (and status did the full fallback). The "struct wt_status des" structure was initialized with the content of the status cache (and thus defaulted to "complete"). This change sets "des.show_untracked_files" to the requested subset from the command-line or config. This allows the long format to print the hint. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
derrickstolee
approved these changes
Jun 26, 2019
derrickstolee
added a commit
to microsoft/VFSForGit
that referenced
this pull request
Jun 26, 2019
Includes status deserialziation bug fix from microsoft/git#157.
|
Adding @jrbriggs for visibility. |
dscho
reviewed
Jun 26, 2019
| git init hint && | ||
| echo xxx >hint/xxx && | ||
| git -C hint add xxx && | ||
| git -C hint commit -m xxx && |
There was a problem hiding this comment.
Wouldn't test_commit -C hint xxx be more succinct than those three lines? (Of course, the file is then called xxx.t, but it would be easy to adapt the test case to that, no?)
| cat >expect.clean <<EOF && | ||
| On branch master | ||
| nothing to commit, working tree clean | ||
| EOF |
There was a problem hiding this comment.
Please use <<-\EOF and indent the text.
|
|
||
| # Create long format output for "complete" and create status cache. | ||
|
|
||
| git -C hint status --untracked-files=complete --ignored=matching --serialize=../hint.dat >hint.output_complete && |
There was a problem hiding this comment.
I think this line needs to be broken (with a \ continuation)...
derrickstolee
added a commit
to microsoft/VFSForGit
that referenced
this pull request
Jun 26, 2019
Includes status deserialziation bug fix from microsoft/git#157.
derrickstolee
added a commit
to microsoft/VFSForGit
that referenced
this pull request
Jul 1, 2019
Includes status deserialziation bug fix from microsoft/git#157. Further, update the dehydrate verb to specifically use `-uall` when checking for local changes.
dscho
pushed a commit
that referenced
this pull request
Aug 17, 2019
…cked-hint status: deserialize with -uno does not print correct hint
derrickstolee
pushed a commit
that referenced
this pull request
Oct 23, 2019
…cked-hint status: deserialize with -uno does not print correct hint
derrickstolee
pushed a commit
that referenced
this pull request
Nov 4, 2019
…cked-hint status: deserialize with -uno does not print correct hint
derrickstolee
pushed a commit
that referenced
this pull request
Jan 14, 2020
…cked-hint status: deserialize with -uno does not print correct hint
derrickstolee
pushed a commit
that referenced
this pull request
Feb 21, 2020
…cked-hint status: deserialize with -uno does not print correct hint
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.
With the "--untracked-files=complete" option status computes a
superset of the untracked files. We use this when writing the
status cache. If subsequent deserialize commands ask for either
the complete set or one of the "no", "normal", or "all" subsets,
it can still use the cache file because of filtering in the
deserialize parser.
When running status with the "-uno" option, the long format
status would print a "(use -u to show untracked files)" hint.
When deserializing with the "-uno" option and using a cache computed
with "-ucomplete", the "nothing to commit, working tree clean" message
would be printed instead of the hint.
It was easy to miss because the correct hint message was printed
if the cache was rejected for any reason (and status did the full
fallback).
The "struct wt_status des" structure was initialized with the
content of the status cache (and thus defaulted to "complete").
This change sets "des.show_untracked_files" to the requested
subset from the command-line or config. This allows the long
format to print the hint.
Signed-off-by: Jeff Hostetler jeffhost@microsoft.com