Compare commits
3 commits
aba434274e
...
ae3a149449
Author | SHA1 | Date | |
---|---|---|---|
|
ae3a149449 | ||
|
85e8c1ddfc | ||
|
a7939bec7b |
2 changed files with 3 additions and 4 deletions
|
@ -343,14 +343,13 @@ def test_clone_subdirectory(runner, paths, yadm_cmd, repo_config):
|
||||||
remote_url = f"file://{paths.remote}"
|
remote_url = f"file://{paths.remote}"
|
||||||
|
|
||||||
# run the clone command
|
# run the clone command
|
||||||
args = ["clone", "-w", paths.work]
|
args = ["clone", "-w", paths.work, remote_url]
|
||||||
args += [remote_url]
|
|
||||||
run = runner(command=yadm_cmd(*args), cwd=subdir)
|
run = runner(command=yadm_cmd(*args), cwd=subdir)
|
||||||
|
|
||||||
# clone should succeed, and repo should be configured properly
|
# clone should succeed, and repo should be configured properly
|
||||||
assert successful_clone(run, paths, repo_config)
|
assert successful_clone(run, paths, repo_config)
|
||||||
|
|
||||||
# test that the conflicts are preserved in the work tree
|
# ensure that no changes found as this is a clean dotfiles clone
|
||||||
run = runner(command=yadm_cmd("status", "-uno", "--porcelain"), cwd=subdir)
|
run = runner(command=yadm_cmd("status", "-uno", "--porcelain"), cwd=subdir)
|
||||||
assert run.success
|
assert run.success
|
||||||
assert run.out == ""
|
assert run.out == ""
|
||||||
|
|
2
yadm
2
yadm
|
@ -827,7 +827,7 @@ function clone() {
|
||||||
rm -rf "$wc"
|
rm -rf "$wc"
|
||||||
|
|
||||||
# then reset the index as the --no-checkout flag makes the index empty
|
# then reset the index as the --no-checkout flag makes the index empty
|
||||||
"$GIT_PROGRAM" reset --quiet -- "$YADM_WORK"
|
"$GIT_PROGRAM" reset --quiet -- ":/"
|
||||||
|
|
||||||
if [ "$YADM_WORK" = "$HOME" ]; then
|
if [ "$YADM_WORK" = "$HOME" ]; then
|
||||||
debug "Determining if repo tracks private directories"
|
debug "Determining if repo tracks private directories"
|
||||||
|
|
Loading…
Reference in a new issue