threads / patch / 44598

patchworktree: mark a file-local symbol with static

Subject: [PATCH] worktree: mark a file-local symbol with static

## tl;dr

2 messages between Dec 2, 2016 and Dec 2, 2016. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Ramsay Jones· Dec 2, 2016, 20:55 UTC · lore

Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
---

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(-)

Show changes to worktree.c +1 −1

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

Stefan Beller· Dec 2, 2016, 21:58 UTC · re: Ramsay Jones · lore

Re: [PATCH] worktree: mark a file-local symbol with static

On Fri, Dec 2, 2016 at 12:55 PM, Ramsay Jones <ramsay@ramsayjones.plus.com> wrote:

Show 8 quoted lines

>
> Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
> ---
>
> Hi Stefan,
>
> If you need to re-roll your 'sb/submodule-intern-gitdir'
> branch,

I will need to reroll it.

Show 6 quoted lines

> 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.]

Oh, ok. I may just reroll the series on top of nd/worktree-list-fixup

Thanks for the annotation! Stefan