diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-06-24 16:39:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-06-24 16:39:15 -0700 |
| commit | 107ed551030713e25933dc8e92ad8d67cff28ff6 (patch) | |
| tree | 6fca7a4ca78eef5a610b846f23b46fbebcbebcb9 | |
| parent | e5ff701d4ca9cb8a472f946846504d9e972c6262 (diff) | |
| parent | bf6a86236e829d08c92356e5c861193ccb516ef7 (diff) | |
| download | git-107ed551030713e25933dc8e92ad8d67cff28ff6.tar.gz | |
Merge branch 'jc/worktree-git-path'
Code cleanup.
* jc/worktree-git-path:
worktree_git_path(): move the declaration to path.h
| -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 2ee6886078..c68deb57ce 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 7cc6d90e66..11279d0c8f 100644 --- a/worktree.h +++ b/worktree.h @@ -178,14 +178,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, |