Re: [PATCH v8 1/4] worktree: add top-level worktree.c
Michael Rappazzo <rappazzo@gmail.com> writes:
Show 42 quoted lines
> worktree.c contains functions to work with and get information from
> worktrees. This introduction moves functions related to worktrees
> from branch.c into worktree.c
>
> Signed-off-by: Michael Rappazzo <rappazzo@gmail.com>
> ---
> Makefile | 1 +
> branch.c | 79 +-----------------------------------------------------
> branch.h | 8 ------
> builtin/notes.c | 1 +
> worktree.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> worktree.h | 12 +++++++++
> 6 files changed, 97 insertions(+), 86 deletions(-)
> create mode 100644 worktree.c
> create mode 100644 worktree.h
> ...
> diff --git a/branch.h b/branch.h
> index d3446ed..58aa45f 100644
> --- a/branch.h
> +++ b/branch.h
> @@ -59,12 +59,4 @@ extern int read_branch_desc(struct strbuf *, const char *branch_name);
> */
> extern void die_if_checked_out(const char *branch);
>
> -/*
> - * Check if a per-worktree symref points to a ref in the main worktree
> - * or any linked worktree, and return the path to the exising worktree
> - * if it is. Returns NULL if there is no existing ref. The caller is
> - * responsible for freeing the returned path.
> - */
> -extern char *find_shared_symref(const char *symref, const char *target);
> -
> #endif
> diff --git a/builtin/notes.c b/builtin/notes.c
> index 3608c64..8b30334 100644
> --- a/builtin/notes.c
> +++ b/builtin/notes.c
> @@ -20,6 +20,7 @@
> #include "notes-merge.h"
> #include "notes-utils.h"
> #include "branch.h"
> +#include "worktree.h"
I think you no longer need to include branch.h after this change.
Other than that, this step looks uncontroversial.
Thanks.