Signed-off-by: Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxxx> --- Hi Stefan, If you need to re-roll your 'sb/submodule-intern-gitdir' branch, could you please squash something similar to this into the relevant patch (commit 2529715dc, "worktree: get worktrees from submodules", 01-12-2016). [This is based on pu; ie. on top of merge 86c7f863a, where Junio as added the 'flags' parameter.] Thanks! ATB, Ramsay Jones worktree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worktree.c b/worktree.c index d5c71095e..ba393fe5c 100644 --- a/worktree.c +++ b/worktree.c @@ -168,7 +168,7 @@ static int compare_worktree(const void *a_, const void *b_) return fspathcmp((*a)->path, (*b)->path); } -struct worktree **get_worktrees_internal(const char *git_common_dir, unsigned flags) +static struct worktree **get_worktrees_internal(const char *git_common_dir, unsigned flags) { struct worktree **list = NULL; struct strbuf path = STRBUF_INIT; -- 2.11.0