Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix broken annex symlink after git-mv before saving + fix a race condition in ssh copy test #6809

Merged
merged 5 commits into from
Jul 6, 2022

Conversation

yarikoptic
Copy link
Member

Bundle of two cherry picked PRs.

christian-monch and others added 5 commits July 6, 2022 10:41
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 yarikoptic added semver-patch Increment the patch version when merged release Create a release when this pr is merged labels Jul 6, 2022
@yarikoptic
Copy link
Member Author

you are so green to me! lovely, since only CPs from master, I guess no objections.

@yarikoptic yarikoptic merged commit 66a61cb into datalad:maint Jul 6, 2022
@github-actions
Copy link

github-actions bot commented Jul 6, 2022

🚀 PR was released in 0.16.7 🚀

@yarikoptic yarikoptic deleted the bf-CPs-from-master branch July 11, 2022 19:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release Create a release when this pr is merged released semver-patch Increment the patch version when merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants