Double check if files still exist before git-add#355
Open
goerz wants to merge 1 commit intodrdoctr:masterfrom
Open
Double check if files still exist before git-add#355goerz wants to merge 1 commit intodrdoctr:masterfrom
goerz wants to merge 1 commit intodrdoctr:masterfrom
Conversation
If the --command flag is used, the given command runs after syncing, but before committing. If the command removes any files that were "added" by the syncing, or re-creates files that were "removed" during the syncing, then the "git add" and "git rm" commands will fail. To get around this, we can just double check if "added" files are still there before calling "git add", respectively "removed" files are still deleted. If there are any changes to the status after the sync, a warning seems appropriate.
goerz
force-pushed
the
double_check_commit
branch
from
baf2cdd to
6fdf9b9
Compare
Author
|
The CI failures do not seem to be related to my patch, cf. the docs-only PR #356 also failing. Let me know if there's anything I should do. |
Member
|
Yeah, there are some fixes I need to do for the tests. I haven't had the time to work on doctr in awhile unfortunately. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
I figured out the problem I was having in #353 with deleting files from the deploy directory via a custom
--command: The command runs after syncing, but before committing. Thus, if the command removes any files that were "added" by the syncing, then the "git add" during the commit will fail.To get around this, we can just double check if "added" files are still there before calling "git add", respectively "removed" files are still deleted. If there are any changes to the status after the sync, a warning seems appropriate.