Support alt dirs with deeply nested tracked files #495
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
Now, as long as there is a tracked file *somewhere* under the alt directory, it will be linked correctly, instead of requiring the tracked files to be direct children of the alt dir.
| @@ -461,7 +461,7 @@ EOF | |||
| -v distro="$local_distro" \ | |||
| -v distro_family="$local_distro_family" \ | |||
| -v source="$input" \ | |||
| -v source_dir="$(dirname "$input")" \ | |||
| -v source_dir="$(builtin_dirname "$input")" \ | |||
There was a problem hiding this comment.
This was just a drive-by cleanup I noticed, from reading builtin_dirname's comment it seems like it should be more portable?
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.
What does this PR do?
Now, as long as there is a tracked file somewhere under the alt directory, it will be linked correctly, instead of requiring the tracked files to be direct children of the alt dir (previous behavior).
What issues does this PR fix or reference?
Closes #490
Related: #328, #356
Previous Behavior
A tracked file had to be a direct child of the
##alt directory for linking the directory to work properly.New Behavior
Any descendant of the
##alt directory will cause it to be treated as an alt, and the directory itself will be linked (same as previous behavior).Have tests been written for this change?
Yes: Updated
test_altto use a subdirectory for its contained file as part of the tests. Verified the test failed before my changes and passes after.Have these commits been signed with GnuPG?
Yes
Please review yadm's Contributing Guide for best practices.