On Fri, Sep 11, 2015 at 03:53:40AM -0400, Jeff King wrote:
>
> Now that we have strbuf_git_path_submodule(), is there any reason to
> switch this away from a strbuf?
>
> That saves us a bunch of strlen calls, and it makes the diff way
> shorter. My ulterior motive is that the result also conflicts a lot less
> with some patches I'm about to post to harden the malloc and strcpy
> calls below.
>
> That would make your patch look something like:
>
> diff --git a/submodule.c b/submodule.c
> index 245ed4d..5e5a46f 100644
> --- a/submodule.c
> +++ b/submodule.c
> @@ -122,15 +122,8 @@ static int add_submodule_odb(const char *path)
> struct strbuf objects_directory = STRBUF_INIT;
> struct alternate_object_database *alt_odb;
> int ret = 0;
> - const char *git_dir;
>
> - strbuf_addf(&objects_directory, "%s/.git", path);
> - git_dir = read_gitfile(objects_directory.buf);
> - if (git_dir) {
> - strbuf_reset(&objects_directory);
> - strbuf_addstr(&objects_directory, git_dir);
> - }
> - strbuf_addstr(&objects_directory, "/objects/");
> + strbuf_git_path_submodule(&objects_directory, path, "objects/");
> if (!is_directory(objects_directory.buf)) {
> ret = -1;
> goto done;
>
> -Peff
Thank you. This is how it looks now.
--
Max
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html