From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 May 2018 05:15:14 +0000 (+0900)
Subject: Sync with Git 2.14.4
X-Git-Tag: v2.15.2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9e0f06d55df5855178ff41342937943604f6e97c

Sync with Git 2.14.4

* maint-2.14:
Git 2.14.4
Git 2.13.7
verify_path: disallow symlinks in .gitmodules
update-index: stat updated files earlier
verify_dotfile: mention case-insensitivity in comment
verify_path: drop clever fallthrough
skip_prefix: add case-insensitive variant
is_{hfs,ntfs}_dotgitmodules: add tests
is_ntfs_dotgit: match other .git files
is_hfs_dotgit: match other .git files
is_ntfs_dotgit: use a size_t for traversing string
submodule-config: verify submodule names as paths
---

9e0f06d55df5855178ff41342937943604f6e97c
diff --cc submodule-config.h
index e3845831f6,634fe39565..93880cf021
--- a/submodule-config.h
+++ b/submodule-config.h
@@@ -34,15 -33,26 +34,22 @@@ extern int option_fetch_parse_recurse_s
  						 const char *arg, int unset);
  extern int parse_update_recurse_submodules_arg(const char *opt, const char *arg);
  extern int parse_push_recurse_submodules_arg(const char *opt, const char *arg);
 -extern int parse_submodule_config_option(const char *var, const char *value);
 -extern int submodule_config_option(struct repository *repo,
 -				   const char *var, const char *value);
 +extern void repo_read_gitmodules(struct repository *repo);
 +extern void gitmodules_config_oid(const struct object_id *commit_oid);
  extern const struct submodule *submodule_from_name(
 -		const unsigned char *commit_or_tree, const char *name);
 +		const struct object_id *commit_or_tree, const char *name);
  extern const struct submodule *submodule_from_path(
 -		const unsigned char *commit_or_tree, const char *path);
 +		const struct object_id *commit_or_tree, const char *path);
  extern const struct submodule *submodule_from_cache(struct repository *repo,
 -						    const unsigned char *treeish_name,
 +						    const struct object_id *treeish_name,
  						    const char *key);
 -extern int gitmodule_sha1_from_commit(const unsigned char *commit_sha1,
 -				      unsigned char *gitmodules_sha1,
 -				      struct strbuf *rev);
  extern void submodule_free(void);
  
+ /*
+  * Returns 0 if the name is syntactically acceptable as a submodule "name"
+  * (e.g., that may be found in the subsection of a .gitmodules file) and -1
+  * otherwise.
+  */
+ int check_submodule_name(const char *name);
+ 
  #endif /* SUBMODULE_CONFIG_H */