Fix broken annex symlink after git-mv before saving + fix a race condition in ssh copy test #6809
Conversation
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
This commit modifies the ssh copy test in such a way that it does not any longer copy files into themselves. This happended before when the source directory was populated, and caused a race condition
This commit adds a comment to explain why we change the name of the destination file, when copying a file with obscure filename via ssh. The reason is that the test setup maps the source and destination directories to the same directory on the test machine, i.e. the file is copied onto itself. With ssh version 9, this leads to an empty file.
This commit unifies the string quotes in test_ssh_copy to consistently use single quotes. Conflicts: datalad/support/tests/test_sshconnector.py - " -> ' were done for no reason causing conflicts
This commit unify the source file specification to use lists in call ssh.put()-calls when populating the source directory for the ssh copy test.
This change is picking up on the discussion in datalad#4967 and the stale PR datalad#5016. Previously, annex'ed files moved with `git-mv` were repaired by git-annex only after `datalad save` performed change detection. This led to `save()` leaving the dataset in a non-clean state, and require a second `save()` call. This change prevents this outcome by specifically calling `git annex pre-commit` on any already staged symlinks, before processing by `save()`. Fixes datalad#4967
yarikoptic
added
semver-patch
Member
Author
|
you are so green to me! lovely, since only CPs from master, I guess no objections. |
|
🚀 PR was released in |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Bundle of two cherry picked PRs.