Draft: Include 'deleted' files in sparse reapply #40
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
erikmchut
reviewed
Feb 6, 2024
| @@ -415,7 +415,7 @@ int git_sparse_checkout__reapply(git_repository *repo, git_sparse *sparse) | |||
| /* Don't touch files that aren't current */ | |||
| if ((error = git_status_file(&status_flags, repo, entry->path)) < 0) | |||
| goto done; | |||
| if (status_flags != GIT_STATUS_CURRENT) | |||
| if (status_flags != GIT_STATUS_CURRENT && status_flags != GIT_STATUS_WT_DELETED) | |||
There was a problem hiding this comment.
status_flags are a bitmask, so seeing equality operators is a bit strange.
Stepping back – GIT_STATUS_CURRENT are files where the Index and working directory match the HEAD ref. git reapply doesn't want obliterate an unstaged or staged change. Arguably this should be allowed with a force flag, regardless, the underlying problem is that git_status_file is showing GIT_STATUS_WT_DELETED when a file is missing from the worktree (I'm guessing because it is not in the sparse checkout).
Perhaps the root fix it to modify git_status_file to that it doesn't return GIT_STATUS_WT_DELETE for sparse-no-checkout files?
cmbartschat
force-pushed
the
cbartschat-fix
branch
from
c6dfe2c to
cd5cadf
Compare
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.
This seems to be fixing things. Not sure if this is a sign of something else not working, or if this is expected.