diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-03-17 13:37:37 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-03-17 13:43:08 -0700 |
commit | a5979d7009017c79b0100b7b66e8567b3ad7b022 (patch) | |
tree | e0386b6988b0aaeb6a6ce43cd5a4a5eb6c4e6776 /fsck.c | |
parent | Git 2.19.3 (diff) | |
parent | Git 2.18.3 (diff) | |
download | tgif-a5979d7009017c79b0100b7b66e8567b3ad7b022.tar.xz |
Git 2.19.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fsck.c')
-rw-r--r-- | fsck.c | 16 |
1 files changed, 15 insertions, 1 deletions
@@ -16,6 +16,7 @@ #include "packfile.h" #include "submodule-config.h" #include "config.h" +#include "credential.h" #include "help.h" static struct oidset gitmodules_found = OIDSET_INIT; @@ -988,6 +989,19 @@ static int fsck_tag(struct tag *tag, const char *data, return fsck_tag_buffer(tag, data, size, options); } +static int check_submodule_url(const char *url) +{ + struct credential c = CREDENTIAL_INIT; + int ret; + + if (looks_like_command_line_option(url)) + return -1; + + ret = credential_from_url_gently(&c, url, 1); + credential_clear(&c); + return ret; +} + struct fsck_gitmodules_data { struct object *obj; struct fsck_options *options; @@ -1012,7 +1026,7 @@ static int fsck_gitmodules_fn(const char *var, const char *value, void *vdata) "disallowed submodule name: %s", name); if (!strcmp(key, "url") && value && - looks_like_command_line_option(value)) + check_submodule_url(value) < 0) data->ret |= report(data->options, data->obj, FSCK_MSG_GITMODULES_URL, "disallowed submodule url: %s", |