Merge branch 'jc/worktree-git-path'

Code cleanup.

* jc/worktree-git-path:
  worktree_git_path(): move the declaration to path.h
This commit is contained in:
Junio C Hamano 2024-06-24 16:39:15 -07:00
commit 107ed55103
3 changed files with 10 additions and 8 deletions

9
path.h
View file

@ -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
@ -81,6 +82,14 @@ void strbuf_repo_git_path(struct strbuf *sb,
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.
*/

View file

@ -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"

View file

@ -177,14 +177,6 @@ int other_head_refs(each_ref_fn fn, void *cb_data);
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.
*/