summaryrefslogtreecommitdiff
path: root/fsck.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-09-27 18:50:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-09-27 18:50:45 (GMT)
commit1958ad504befa6a09c475cc8ab9de43b359de137 (patch)
tree900dd4eebc62b31355313e18b3bd4fee4ef02600 /fsck.c
parent1d4361b0f344188ab5eec6dcea01f61a3a3a1670 (diff)
parent268fbcd172cdb306e8a3e7143cc16677c963d6cd (diff)
downloadgit-1958ad504befa6a09c475cc8ab9de43b359de137.zip
git-1958ad504befa6a09c475cc8ab9de43b359de137.tar.gz
git-1958ad504befa6a09c475cc8ab9de43b359de137.tar.bz2
Sync with 2.18.1
* maint-2.18: Git 2.18.1 Git 2.17.2 fsck: detect submodule paths starting with dash fsck: detect submodule urls starting with dash Git 2.16.5 Git 2.15.3 Git 2.14.5 submodule-config: ban submodule paths that start with a dash submodule-config: ban submodule urls that start with dash submodule--helper: use "--" to signal end of clone options
Diffstat (limited to 'fsck.c')
-rw-r--r--fsck.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/fsck.c b/fsck.c
index a0cee0b..0f56977 100644
--- a/fsck.c
+++ b/fsck.c
@@ -67,6 +67,8 @@ static struct oidset gitmodules_done = OIDSET_INIT;
FUNC(GITMODULES_LARGE, ERROR) \
FUNC(GITMODULES_NAME, ERROR) \
FUNC(GITMODULES_SYMLINK, ERROR) \
+ FUNC(GITMODULES_URL, ERROR) \
+ FUNC(GITMODULES_PATH, ERROR) \
/* warnings */ \
FUNC(BAD_FILEMODE, WARN) \
FUNC(EMPTY_NAME, WARN) \
@@ -992,6 +994,18 @@ static int fsck_gitmodules_fn(const char *var, const char *value, void *vdata)
FSCK_MSG_GITMODULES_NAME,
"disallowed submodule name: %s",
name);
+ if (!strcmp(key, "url") && value &&
+ looks_like_command_line_option(value))
+ data->ret |= report(data->options, data->obj,
+ FSCK_MSG_GITMODULES_URL,
+ "disallowed submodule url: %s",
+ value);
+ if (!strcmp(key, "path") && value &&
+ looks_like_command_line_option(value))
+ data->ret |= report(data->options, data->obj,
+ FSCK_MSG_GITMODULES_PATH,
+ "disallowed submodule path: %s",
+ value);
free(name);
return 0;