Merge branch 'ah/doc-wserrorhighlight'

diff --git a/path.h b/path.h
index c779c4aa2878b6cc566f046a1140e47e9361cb33..9541620c79dcda31e4a1b7437a79f0f63b156523 100644 (file)
--- a/path.h
+++ b/path.h
@@ -43,6 +43,14 @@ extern void strbuf_repo_git_path(struct strbuf *sb,
                                 const char *fmt, ...)
        __attribute__((format (printf, 3, 4)));
 
+extern char *repo_worktree_path(const struct repository *repo,
+                               const char *fmt, ...)
+       __attribute__((format (printf, 2, 3)));
+extern void strbuf_repo_worktree_path(struct strbuf *sb,
+                                     const struct repository *repo,
+                                     const char *fmt, ...)
+       __attribute__((format (printf, 3, 4)));
+
 extern void report_linked_checkout_garbage(void);
 
 /*