Merge branch 'rs/submodule-config-code-cleanup'

Code cleanup.

* rs/submodule-config-code-cleanup:
submodule-config: fix test binary crashing when no arguments given
submodule-config: combine early return code into one goto
submodule-config: passing name reference for .gitmodule blobs
submodule-config: use explicit empty string instead of strbuf in config_from()

diff --combined submodule-config.c
index 077db4054f7b38b31d9c6f11e2b589e9111d4a8c,a8875745909f65325c055b5fe5c4a4dc1383ff1b..faedb1a4899639567d8d6d6af75338c26be8f7ae
--- 1/submodule-config.c
--- 2/submodule-config.c
+++ b/submodule-config.c
@@@ -59,7 -59,6 +59,7 @@@ static void free_one_config(struct subm
  {
        free((void *) entry->config->path);
        free((void *) entry->config->name);
 +      free((void *) entry->config->update_strategy.command);
        free(entry->config);
  }
  
@@@ -195,11 -194,8 +195,11 @@@ static struct submodule *lookup_or_crea
  
        submodule->path = NULL;
        submodule->url = NULL;
 +      submodule->update_strategy.type = SM_UPDATE_UNSPECIFIED;
 +      submodule->update_strategy.command = NULL;
        submodule->fetch_recurse = RECURSE_SUBMODULES_NONE;
        submodule->ignore = NULL;
 +      submodule->recommend_shallow = -1;
  
        hashcpy(submodule->gitmodules_sha1, gitmodules_sha1);
  
@@@ -297,7 -293,7 +297,7 @@@ static int parse_config(const char *var
        if (!strcmp(item.buf, "path")) {
                if (!value)
                        ret = config_error_nonbool(var);
 -              else if (!me->overwrite && submodule->path != NULL)
 +              else if (!me->overwrite && submodule->path)
                        warn_multiple_config(me->commit_sha1, submodule->name,
                                        "path");
                else {
@@@ -321,7 -317,7 +321,7 @@@
        } else if (!strcmp(item.buf, "ignore")) {
                if (!value)
                        ret = config_error_nonbool(var);
 -              else if (!me->overwrite && submodule->ignore != NULL)
 +              else if (!me->overwrite && submodule->ignore)
                        warn_multiple_config(me->commit_sha1, submodule->name,
                                        "ignore");
                else if (strcmp(value, "untracked") &&
@@@ -337,31 -333,13 +337,31 @@@
        } else if (!strcmp(item.buf, "url")) {
                if (!value) {
                        ret = config_error_nonbool(var);
 -              } else if (!me->overwrite && submodule->url != NULL) {
 +              } else if (!me->overwrite && submodule->url) {
                        warn_multiple_config(me->commit_sha1, submodule->name,
                                        "url");
                } else {
                        free((void *) submodule->url);
                        submodule->url = xstrdup(value);
                }
 +      } else if (!strcmp(item.buf, "update")) {
 +              if (!value)
 +                      ret = config_error_nonbool(var);
 +              else if (!me->overwrite &&
 +                       submodule->update_strategy.type != SM_UPDATE_UNSPECIFIED)
 +                      warn_multiple_config(me->commit_sha1, submodule->name,
 +                                           "update");
 +              else if (parse_submodule_update_strategy(value,
 +                       &submodule->update_strategy) < 0)
 +                              die(_("invalid value for %s"), var);
 +      } else if (!strcmp(item.buf, "shallow")) {
 +              if (!me->overwrite && submodule->recommend_shallow != -1)
 +                      warn_multiple_config(me->commit_sha1, submodule->name,
 +                                           "shallow");
 +              else {
 +                      submodule->recommend_shallow =
 +                              git_config_bool(var, value);
 +              }
        }
  
        strbuf_release(&name);
@@@ -371,21 -349,20 +371,20 @@@
  }
  
  static int gitmodule_sha1_from_commit(const unsigned char *commit_sha1,
-                                     unsigned char *gitmodules_sha1)
+                                     unsigned char *gitmodules_sha1,
+                                     struct strbuf *rev)
  {
-       struct strbuf rev = STRBUF_INIT;
        int ret = 0;
  
        if (is_null_sha1(commit_sha1)) {
 -              hashcpy(gitmodules_sha1, null_sha1);
 +              hashclr(gitmodules_sha1);
                return 1;
        }
  
-       strbuf_addf(&rev, "%s:.gitmodules", sha1_to_hex(commit_sha1));
-       if (get_sha1(rev.buf, gitmodules_sha1) >= 0)
+       strbuf_addf(rev, "%s:.gitmodules", sha1_to_hex(commit_sha1));
+       if (get_sha1(rev->buf, gitmodules_sha1) >= 0)
                ret = 1;
  
-       strbuf_release(&rev);
        return ret;
  }
  
@@@ -399,7 -376,7 +398,7 @@@ static const struct submodule *config_f
  {
        struct strbuf rev = STRBUF_INIT;
        unsigned long config_size;
-       char *config;
+       char *config = NULL;
        unsigned char sha1[20];
        enum object_type type;
        const struct submodule *submodule = NULL;
@@@ -420,8 -397,8 +419,8 @@@
                return entry->config;
        }
  
-       if (!gitmodule_sha1_from_commit(commit_sha1, sha1))
-               return NULL;
+       if (!gitmodule_sha1_from_commit(commit_sha1, sha1, &rev))
+               goto out;
  
        switch (lookup_type) {
        case lookup_name:
@@@ -432,16 -409,11 +431,11 @@@
                break;
        }
        if (submodule)
-               return submodule;
+               goto out;
  
        config = read_sha1_file(sha1, &type, &config_size);
-       if (!config)
-               return NULL;
- 
-       if (type != OBJ_BLOB) {
-               free(config);
-               return NULL;
-       }
+       if (!config || type != OBJ_BLOB)
+               goto out;
  
        /* fill the submodule config into the cache */
        parameter.cache = cache;
@@@ -450,6 -422,7 +444,7 @@@
        parameter.overwrite = 0;
        git_config_from_mem(parse_config, "submodule-blob", rev.buf,
                        config, config_size, &parameter);
+       strbuf_release(&rev);
        free(config);
  
        switch (lookup_type) {
@@@ -460,6 -433,11 +455,11 @@@
        default:
                return NULL;
        }
+ 
+ out:
+       strbuf_release(&rev);
+       free(config);
+       return submodule;
  }
  
  static const struct submodule *config_from_path(struct submodule_cache *cache,

diff --combined t/helper/test-submodule-config.c
index 61049b87a07c638a9211b11484c503ffc56a1f9e,0000000000000000000000000000000000000000..2f144d539a4822619a9383ded2d3adb270484624
mode 100644,000000..100644
--- 1/t/helper/test-submodule-config.c
--- /dev/null
+++ b/t/helper/test-submodule-config.c
@@@ -1,76 -1,0 +1,76 @@@
-       while (starts_with(arg[0], "--")) {
 +#include "cache.h"
 +#include "submodule-config.h"
 +#include "submodule.h"
 +
 +static void die_usage(int argc, const char **argv, const char *msg)
 +{
 +      fprintf(stderr, "%s\n", msg);
 +      fprintf(stderr, "Usage: %s [<commit> <submodulepath>] ...\n", argv[0]);
 +      exit(1);
 +}
 +
 +static int git_test_config(const char *var, const char *value, void *cb)
 +{
 +      return parse_submodule_config_option(var, value);
 +}
 +
 +int cmd_main(int argc, const char **argv)
 +{
 +      const char **arg = argv;
 +      int my_argc = argc;
 +      int output_url = 0;
 +      int lookup_name = 0;
 +
 +      arg++;
 +      my_argc--;
++      while (arg[0] && starts_with(arg[0], "--")) {
 +              if (!strcmp(arg[0], "--url"))
 +                      output_url = 1;
 +              if (!strcmp(arg[0], "--name"))
 +                      lookup_name = 1;
 +              arg++;
 +              my_argc--;
 +      }
 +
 +      if (my_argc % 2 != 0)
 +              die_usage(argc, argv, "Wrong number of arguments.");
 +
 +      setup_git_directory();
 +      gitmodules_config();
 +      git_config(git_test_config, NULL);
 +
 +      while (*arg) {
 +              unsigned char commit_sha1[20];
 +              const struct submodule *submodule;
 +              const char *commit;
 +              const char *path_or_name;
 +
 +              commit = arg[0];
 +              path_or_name = arg[1];
 +
 +              if (commit[0] == '\0')
 +                      hashclr(commit_sha1);
 +              else if (get_sha1(commit, commit_sha1) < 0)
 +                      die_usage(argc, argv, "Commit not found.");
 +
 +              if (lookup_name) {
 +                      submodule = submodule_from_name(commit_sha1, path_or_name);
 +              } else
 +                      submodule = submodule_from_path(commit_sha1, path_or_name);
 +              if (!submodule)
 +                      die_usage(argc, argv, "Submodule not found.");
 +
 +              if (output_url)
 +                      printf("Submodule url: '%s' for path '%s'\n",
 +                                      submodule->url, submodule->path);
 +              else
 +                      printf("Submodule name: '%s' for path '%s'\n",
 +                                      submodule->name, submodule->path);
 +
 +              arg += 2;
 +      }
 +
 +      submodule_free();
 +
 +      return 0;
 +}