Sync with 2.18.1
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Sep 2018 18:50:45 +0000 (11:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Sep 2018 18:50:45 +0000 (11:50 -0700)
* 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

1  2 
builtin/submodule--helper.c
fsck.c
submodule-config.c
Simple merge
diff --cc fsck.c
index a0cee0be590020e4ff4b42da86c322ba4d0010ae,51f61ffbc21918361111a2e1069be3aac54b6584..0f56977d6aa6499c06e31eddb8ed4afe484fcdc4
--- 1/fsck.c
--- 2/fsck.c
+++ b/fsck.c
@@@ -64,9 -61,11 +64,11 @@@ static struct oidset gitmodules_done = 
        FUNC(ZERO_PADDED_DATE, ERROR) \
        FUNC(GITMODULES_MISSING, ERROR) \
        FUNC(GITMODULES_BLOB, ERROR) \
 -      FUNC(GITMODULES_PARSE, ERROR) \
 +      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) \
Simple merge