Merge pull request #595 from twpayne/fix-594

Include relative path in template name
twpayne · Feb 12, 2020 · c11e4c9 · c11e4c9
2 parents 37096b0 + 23bda0a
commit c11e4c9
Show file tree

Hide file tree

Showing 4 changed files with 814 additions and 806 deletions.
diff --git a/cmd/apply_test.go b/cmd/apply_test.go
@@ -111,6 +111,16 @@ func TestApplyCommand(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "partial_template_in_subdir",
+			root: map[string]interface{}{
+				"/home/user/.local/share/chezmoi": map[string]interface{}{
+					"dir/file.tmpl":             `{{ template "foo" }}{{ template "bar/foo" }}`,
+					".chezmoitemplates/foo":     "{{ if true }}cont{{ end }}",
+					".chezmoitemplates/bar/foo": "{{ if true }}ents{{ end }}",
+				},
+			},
+		},
 		{
 			name: "multiple_templates",
 			root: map[string]interface{}{