Re: [PATCH] submodule: mark a file-local symbol as static

[Stefan Beller]

On Sat, Aug 13, 2016 at 7:31 AM, Ramsay Jones
 wrote:
>
> Signed-off-by: Ramsay Jones 
> ---
>
> 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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] submodule: mark a file-local symbol as static

[Ramsay Jones]

Signed-off-by: Ramsay Jones 
---

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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] submodule: mark a file-local symbol as static

[Stefan Beller]

On Thu, Aug 11, 2016 at 12:57 PM, Ramsay Jones
 wrote:
>
> Signed-off-by: Ramsay Jones 
> ---
>
> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] submodule: mark a file-local symbol as static

[Ramsay Jones]

Signed-off-by: Ramsay Jones 
---

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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html