* [PATCH] worktree: mark a file-local symbol with static
@ 2016-12-02 20:55 Ramsay Jones
2016-12-02 21:58 ` Stefan Beller
0 siblings, 1 reply; 2+ messages in thread
From: Ramsay Jones @ 2016-12-02 20:55 UTC (permalink / raw)
To: Stefan Beller; +Cc: Junio C Hamano, GIT Mailing-list
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(-)
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] worktree: mark a file-local symbol with static
2016-12-02 20:55 [PATCH] worktree: mark a file-local symbol with static Ramsay Jones
@ 2016-12-02 21:58 ` Stefan Beller
0 siblings, 0 replies; 2+ messages in thread
From: Stefan Beller @ 2016-12-02 21:58 UTC (permalink / raw)
To: Ramsay Jones; +Cc: Junio C Hamano, GIT Mailing-list
On Fri, Dec 2, 2016 at 12:55 PM, Ramsay Jones
<ramsay@ramsayjones.plus.com> wrote:
>
> 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.
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-12-02 21:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-02 20:55 [PATCH] worktree: mark a file-local symbol with static Ramsay Jones
2016-12-02 21:58 ` Stefan Beller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.