Merge 9f852c1ad4 into 6ee9b472d1

fix(clone): reset index of YADM_WORK

test/test_clone.py

@@ -326,3 +326,31 @@ def test_no_repo(
 def verify_head(paths, branch):
     """Assert the local repo has the correct head branch"""
     assert paths.repo.join("HEAD").read() == f"ref: refs/heads/{branch}\n"
+
+
+@pytest.mark.usefixtures("remote")
+def test_clone_subdirectory(runner, paths, yadm_cmd, repo_config):
+    """Test clone from sub-directory of YADM_WORK"""
+
+    # clear out the work path
+    paths.work.remove()
+    paths.work.mkdir()
+
+    # create sub-directory
+    subdir = paths.work.mkdir("subdir")
+
+    # determine remote url
+    remote_url = f"file://{paths.remote}"
+
+    # run the clone command
+    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)
+
+    # 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 == ""
+    assert run.err == ""

yadm

@@ -204,6 +204,7 @@ function score_file() {
         return
       fi
     elif [[ "$label" =~ ^(d|distro)$ ]]; then
+      value=$("${AWK_PROGRAM[0]}" '{print tolower($0)}' <<<"$value")
       if [ "${value/\ /_}" = "${local_distro/\ /_}" ]; then
         score=$((score + 4))
       else
@@ -211,6 +212,7 @@ function score_file() {
         return
       fi
     elif [[ "$label" =~ ^(f|distro_family)$ ]]; then
+      value=$("${AWK_PROGRAM[0]}" '{print tolower($0)}' <<<"$value")
       if [ "${value/\ /_}" = "${local_distro_family/\ /_}" ]; then
         score=$((score + 8))
       else
@@ -853,7 +855,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 -- ":/"
 
   if [ "$YADM_WORK" = "$HOME" ]; then
     debug "Determining if repo tracks private directories"
@@ -1548,7 +1550,7 @@ function query_distro() {
       fi
     done < "$OS_RELEASE"
   fi
-  echo "$distro"
+  "${AWK_PROGRAM[0]}" '{print tolower($0)}' <<<"$distro"
 }
 
 function query_distro_family() {
@@ -1559,10 +1561,13 @@ function query_distro_family() {
         family="${line#ID_LIKE=}"
         family="${family//\"}"
         break
+      elif [[ -z "$family" && "$line" = ID=* ]]; then
+        family="${line#ID=}"
+        family="${family//\"}"
       fi
     done < "$OS_RELEASE"
   fi
-  echo "$family"
+  "${AWK_PROGRAM[0]}" '{print tolower($0)}' <<<"$distro"
 }
 
 function process_global_args() {