fix(clone): reset index of YADM_WORK #507
Merged
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
Whenever using `clone` command inside YADM_WORK sub-directory, we need to checkout the correct repo contents. Steps to reproduce: ```bash mkdir $HOME/subdir cd $HOME/subdir yadm clone --bootstrap "<repo-url>" yadm status ```
erijo
reviewed
Nov 24, 2024
test/test_clone.py
Outdated
Comment on lines
346
to
347
| args = ["clone", "-w", paths.work] | ||
| args += [remote_url] |
There was a problem hiding this comment.
Please merge these two lines into one.
test/test_clone.py
Outdated
| # clone should succeed, and repo should be configured properly | ||
| assert successful_clone(run, paths, repo_config) | ||
|
|
||
| # test that the conflicts are preserved in the work tree |
There was a problem hiding this comment.
This seems like an incorrect comment?!
There was a problem hiding this comment.
Fixed in 85e8c1d, english is not my first language
yadm
Outdated
| @@ -827,7 +827,7 @@ function clone() { | |||
| rm -rf "$wc" | |||
|
|
|||
| # then reset the index as the --no-checkout flag makes the index empty | |||
| "$GIT_PROGRAM" reset --quiet -- . | |||
| "$GIT_PROGRAM" reset --quiet -- "$YADM_WORK" | |||
There was a problem hiding this comment.
Consider using :/ instead of $YADM_WORK to match the pathspec used below (in the checkout command).
There was a problem hiding this comment.
Nice info, I just know about pathspec
Changed in ae3a149
|
Thanks for your contribution @AVM-Martin! 👍 |
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?
Whenever using
clonecommand inside YADM_WORK sub-directory, we needto checkout the correct repo contents.
Steps to reproduce:
What issues does this PR fix or reference?
[A list of related issues / pull requests.]
Previous Behavior
yadm statusreported a lot of deleted files.New Behavior
yadm statuswill report clean working directory.Have tests been written for this change?
Yes
Have these commits been signed with GnuPG?
Yes
Please review yadm's Contributing Guide for best practices.