* [PATCH] submodule: mark a file-local symbol as static
@ 2016-08-11 19:57 Ramsay Jones
2016-08-11 20:13 ` Stefan Beller
0 siblings, 1 reply; 4+ messages in thread
From: Ramsay Jones @ 2016-08-11 19:57 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-clone-rr' branch, could
you please squash this into the relevant patch (commit 336c21d,
"submodule: try alternates when superproject has an alternate",
08-08-2016).
Thanks!
ATB,
Ramsay Jones
builtin/submodule--helper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 4c765e1..4c7d03c 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -641,7 +641,7 @@ struct submodule_alternate_setup {
struct strbuf *out;
};
-int add_possible_reference(struct alternate_object_database *alt, void *sas_cb)
+static int add_possible_reference(struct alternate_object_database *alt, void *sas_cb)
{
struct submodule_alternate_setup *sas = sas_cb;
--
2.9.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] submodule: mark a file-local symbol as static
2016-08-11 19:57 [PATCH] submodule: mark a file-local symbol as static Ramsay Jones
@ 2016-08-11 20:13 ` Stefan Beller
0 siblings, 0 replies; 4+ messages in thread
From: Stefan Beller @ 2016-08-11 20:13 UTC (permalink / raw)
To: Ramsay Jones; +Cc: Junio C Hamano, GIT Mailing-list
On Thu, Aug 11, 2016 at 12:57 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-clone-rr' branch, could
> you please squash this into the relevant patch (commit 336c21d,
> "submodule: try alternates when superproject has an alternate",
> 08-08-2016).
Not just reroll but rethink and rewrite. ;)
Thanks for catching!
Stefan
>
> Thanks!
>
> ATB,
> Ramsay Jones
>
> builtin/submodule--helper.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
> index 4c765e1..4c7d03c 100644
> --- a/builtin/submodule--helper.c
> +++ b/builtin/submodule--helper.c
> @@ -641,7 +641,7 @@ struct submodule_alternate_setup {
> struct strbuf *out;
> };
>
> -int add_possible_reference(struct alternate_object_database *alt, void *sas_cb)
> +static int add_possible_reference(struct alternate_object_database *alt, void *sas_cb)
> {
> struct submodule_alternate_setup *sas = sas_cb;
>
> --
> 2.9.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] submodule: mark a file-local symbol as static
@ 2016-08-13 14:31 Ramsay Jones
2016-08-15 19:07 ` Stefan Beller
0 siblings, 1 reply; 4+ messages in thread
From: Ramsay Jones @ 2016-08-13 14:31 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-clone-rr' branch, could
you please squash this into the relevant patch (commit 7bcd1d17,
"clone: recursive and reference option triggers submodule alternates",
11-08-2016).
Thanks!
[What, deja vu? :-D]
ATB,
Ramsay Jones
builtin/submodule--helper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index c617667..cb0b1d7 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -483,7 +483,7 @@ struct submodule_alternate_setup {
#define SUBMODULE_ALTERNATE_SETUP_INIT { NULL, \
SUBMODULE_ALTERNATE_ERROR_IGNORE, NULL }
-int add_possible_reference_from_superproject(
+static int add_possible_reference_from_superproject(
struct alternate_object_database *alt, void *sas_cb)
{
struct submodule_alternate_setup *sas = sas_cb;
--
2.9.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] submodule: mark a file-local symbol as static
2016-08-13 14:31 Ramsay Jones
@ 2016-08-15 19:07 ` Stefan Beller
0 siblings, 0 replies; 4+ messages in thread
From: Stefan Beller @ 2016-08-15 19:07 UTC (permalink / raw)
To: Ramsay Jones; +Cc: Stefan Beller, Junio C Hamano, GIT Mailing-list
On Sat, Aug 13, 2016 at 7:31 AM, 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-clone-rr' branch, could
> you please squash this into the relevant patch (commit 7bcd1d17,
> "clone: recursive and reference option triggers submodule alternates",
> 11-08-2016).
>
> Thanks!
Thanks,
will be fixed in a reroll.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-08-15 19:07 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-11 19:57 [PATCH] submodule: mark a file-local symbol as static Ramsay Jones
2016-08-11 20:13 ` Stefan Beller
-- strict thread matches above, loose matches on Subject: below --
2016-08-13 14:31 Ramsay Jones
2016-08-15 19:07 ` Stefan Beller
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).