diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-06-08 11:39:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-06-08 11:42:37 -0700 |
| commit | bf6a86236e829d08c92356e5c861193ccb516ef7 (patch) | |
| tree | bd1d8ae65b9ea3bb2cbf54935aefe2a1b4eb0a98 | |
| parent | Git 2.45 (diff) | |
| download | git-bf6a86236e829d08c92356e5c861193ccb516ef7.tar.gz git-bf6a86236e829d08c92356e5c861193ccb516ef7.zip | |
worktree_git_path(): move the declaration to path.h
The definition of this function is in path.c but its declaration is
in worktree.h, which is something unexpected. The function is
explained as "Similar to git_path()"; declaring it next to where
git_path() is declared would make more sense.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
| -rw-r--r-- | path.h | 9 | ||||
| -rw-r--r-- | revision.c | 1 | ||||
| -rw-r--r-- | worktree.h | 8 |
3 files changed, 10 insertions, 8 deletions
@@ -4,6 +4,7 @@ struct repository; struct strbuf; struct string_list; +struct worktree; /* * The result to all functions which return statically allocated memory may be @@ -82,6 +83,14 @@ const char *git_path(const char *fmt, ...) __attribute__((format (printf, 1, 2))); /* + * Similar to git_path() but can produce paths for a specified + * worktree instead of current one + */ +const char *worktree_git_path(const struct worktree *wt, + const char *fmt, ...) + __attribute__((format (printf, 2, 3))); + +/* * Return a path into the main repository's (the_repository) git directory. */ char *git_pathdup(const char *fmt, ...) diff --git a/revision.c b/revision.c index 7e45f765d9..9db534f852 100644 --- a/revision.c +++ b/revision.c @@ -29,6 +29,7 @@ #include "bisect.h" #include "packfile.h" #include "worktree.h" +#include "path.h" #include "read-cache.h" #include "setup.h" #include "sparse-index.h" diff --git a/worktree.h b/worktree.h index f14784a2ff..605ed6cb90 100644 --- a/worktree.h +++ b/worktree.h @@ -176,14 +176,6 @@ int is_worktree_being_rebased(const struct worktree *wt, const char *target); int is_worktree_being_bisected(const struct worktree *wt, const char *target); /* - * Similar to git_path() but can produce paths for a specified - * worktree instead of current one - */ -const char *worktree_git_path(const struct worktree *wt, - const char *fmt, ...) - __attribute__((format (printf, 2, 3))); - -/* * Return a refname suitable for access from the current ref store. */ void strbuf_worktree_ref(const struct worktree *wt, |