Merge ae3a149449 into ec10041024

test/test_clone.py

@@ -343,14 +343,13 @@ def test_clone_subdirectory(runner, paths, yadm_cmd, repo_config):
     remote_url = f"file://{paths.remote}"
 
     # run the clone command
-    args = ["clone", "-w", paths.work]
-    args += [remote_url]
+    args = ["clone", "-w", paths.work, remote_url]
     run = runner(command=yadm_cmd(*args), cwd=subdir)
 
     # 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
+    # ensure that no changes found as this is a clean dotfiles clone
     run = runner(command=yadm_cmd("status", "-uno", "--porcelain"), cwd=subdir)
     assert run.success
     assert run.out == ""

yadm

@@ -853,7 +853,7 @@ function clone() {
   rm -rf "$wc"
 
   # 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
     debug "Determining if repo tracks private directories"