New upstream version 0.27.7+dfsg.1

[libgit2.git] / src / submodule.c

diff --git a/src/submodule.c b/src/submodule.c
index 4bf74dcfb62030d0b37202dbe59dd4ac0e0677d5..06b7de585093d5a023dc04e61ad34857e15ef894 100644 (file)
--- a/src/submodule.c
+++ b/src/submodule.c
@@ -1813,6 +1813,14 @@ static int get_value(const char **out, git_config *cfg, git_buf *buf, const char
        return error;
 }
 
+static bool looks_like_command_line_option(const char *s)
+{
+       if (s && s[0] == '-')
+               return true;
+
+       return false;
+}
+
 static int submodule_read_config(git_submodule *sm, git_config *cfg)
 {
        git_buf key = GIT_BUF_INIT;
@@ -1826,24 +1834,31 @@ static int submodule_read_config(git_submodule *sm, git_config *cfg)
 
        if ((error = get_value(&value, cfg, &key, sm->name, "path")) == 0) {
                in_config = 1;
+               /* We would warn here if we had that API */
+               if (!looks_like_command_line_option(value)) {
        /*
         * TODO: if case insensitive filesystem, then the following strcmp
         * should be strcasecmp
         */
-               if (strcmp(sm->name, value) != 0) {
-                       if (sm->path != sm->name)
-                               git__free(sm->path);
-                       sm->path = git__strdup(value);
-                       GITERR_CHECK_ALLOC(sm->path);
+                       if (strcmp(sm->name, value) != 0) {
+                               if (sm->path != sm->name)
+                                       git__free(sm->path);
+                               sm->path = git__strdup(value);
+                               GITERR_CHECK_ALLOC(sm->path);
+                       }
+
                }
        } else if (error != GIT_ENOTFOUND) {
                goto cleanup;
        }
 
        if ((error = get_value(&value, cfg, &key, sm->name, "url")) == 0) {
-               in_config = 1;
-               sm->url = git__strdup(value);
-               GITERR_CHECK_ALLOC(sm->url);
+               /* We would warn here if we had that API */
+               if (!looks_like_command_line_option(value)) {
+                       in_config = 1;
+                       sm->url = git__strdup(value);
+                       GITERR_CHECK_ALLOC(sm->url);
+               }
        } else if (error != GIT_ENOTFOUND) {
                goto cleanup;
        }