From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Sep 2018 18:50:45 +0000 (-0700)
Subject: Sync with 2.18.1
X-Git-Tag: v2.19.1~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1958ad504befa6a09c475cc8ab9de43b359de137;p=thirdparty%2Fgit.git

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
---

1958ad504befa6a09c475cc8ab9de43b359de137
diff --cc fsck.c
index a0cee0be59,51f61ffbc2..0f56977d6a
--- a/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) \