Re: [PATCH] Git segmentation faults if submodule path is empty.

From: Jeff King <peff@peff.net>
Date: Aug 16, 2013, 20:52 UTC
Message-ID: <20130816205246.GA6487@sigill.intra.peff.net>
In-Reply-To: <0C422E09-EE33-4C3F-91D3-F6007F743A38@eyesopen.com>

On Fri, Aug 16, 2013 at 10:59:35AM -0700, Jharrod LaFon wrote:

> Here is an updated patch with a test.

Bits like this that should not be part of the commit message should either go after the "---" lines near the diffstat, or should come before a scissors line, like:

  Here is my new patch.

  -- >8 --
  Git segmentation faults etc...

That way git-am can do the right thing, and the maintainer does not have to fix up your patch by hand.

Show 10 quoted lines

> diff --git a/submodule.c b/submodule.c
> index 1821a5b..1e4acfd 100644
> --- a/submodule.c
> +++ b/submodule.c
> @@ -134,6 +134,9 @@ int parse_submodule_config_option(const char *var, const char *value)
>  		return 0;
>  
>  	if (!strcmp(key, "path")) {
> +        if (!value)
> +            return config_error_nonbool(var);

Your indentation looks like two spaces here, which does not match the rest of the block. It should be one tab.

Show 7 quoted lines

> @@ -151,6 +154,9 @@ int parse_submodule_config_option(const char *var, const char *value)
>  	} else if (!strcmp(key, "ignore")) {
>  		char *name_cstr;
>  
> +        if (!value)
> +            return config_error_nonbool(var);
> +

Ditto here.

Show 16 quoted lines

> diff --git a/t/t1307-null-submodule-path.sh b/t/t1307-null-submodule-path.sh
> new file mode 100644
> index 0000000..eeda2cb
> --- /dev/null
> +++ b/t/t1307-null-submodule-path.sh
> @@ -0,0 +1,16 @@
> +#!/bin/sh
> +
> +test_description='test empty submodule path'
> +. ./test-lib.sh
> +
> +setup() {
> +    (printf "[submodule \"test\"]\n" && 
> +    printf "  path\n" &&
> +    printf "  url") >.gitmodules
> +}

You can use single-quotes to avoid having to backslash the embedded double-quotes. And I do not see any reason to use printf rather than the more readable echo, which can drop the "\n".

And is there any point in having the "url" field? The presence of a valueless bool "path" should be enough, no? It may be easier to see what it is we are testing without the extraneous parameter.

With those changes, you could even put it all on one line:

  echo '[submodule "test"] path' >.gitmodules

-Peff