[PATCH] submodule.c: fix an 'using integer as NULL pointer' warning

Ramsay Jones· Mar 16, 2017, 01:02 UTC · lore

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

Hi Brandon,

If you need to re-roll your 'bw/submodule-is-active' branch, could you please squash this into the relevant patch (commit 20d59ab335, "submodule: decouple url and submodule existence", 13-03-2017).

Thanks!

ATB, Ramsay Jones

 submodule.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to submodule.c +1 −1

diff --git a/submodule.c b/submodule.c
index 800283154..a77d11cc4 100644
--- a/submodule.c
+++ b/submodule.c
@@ -245,7 +245,7 @@ int is_submodule_initialized(const char *path)
 			argv_array_push(&args, item->string);
 		}
 
-		parse_pathspec(&ps, 0, 0, 0, args.argv);
+		parse_pathspec(&ps, 0, 0, NULL, args.argv);
 		ret = match_pathspec(&ps, path, strlen(path), 0, NULL, 1);
 
 		argv_array_clear(&args);

-- 
2.12.0

Brandon Williams· Mar 16, 2017, 04:49 UTC · re: Ramsay Jones · lore

Re: [PATCH] submodule.c: fix an 'using integer as NULL pointer' warning

On 03/16, Ramsay Jones wrote:

Show 9 quoted lines

> 
> Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
> ---
> 
> Hi Brandon,
> 
> If you need to re-roll your 'bw/submodule-is-active' branch, could
> you please squash this into the relevant patch (commit 20d59ab335,
> "submodule: decouple url and submodule existence", 13-03-2017).

Thanks for catching this, I've squashed it into my local branch and I'm planning on sending out a reroll in a day or so.

Show 24 quoted lines

> 
> Thanks!
> 
> ATB,
> Ramsay Jones
> 
>  submodule.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/submodule.c b/submodule.c
> index 800283154..a77d11cc4 100644
> --- a/submodule.c
> +++ b/submodule.c
> @@ -245,7 +245,7 @@ int is_submodule_initialized(const char *path)
>  			argv_array_push(&args, item->string);
>  		}
>  
> -		parse_pathspec(&ps, 0, 0, 0, args.argv);
> +		parse_pathspec(&ps, 0, 0, NULL, args.argv);
>  		ret = match_pathspec(&ps, path, strlen(path), 0, NULL, 1);
>  
>  		argv_array_clear(&args);
> -- 
> 2.12.0

-- 
Brandon Williams

patchsubmodule.c: fix an 'using integer as NULL pointer' warning