From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Sep 2018 18:45:01 +0000 (-0700)
Subject: Sync with 2.17.2
X-Git-Tag: v2.18.1~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/44f87dac99574a8073ffb1ba8b10bd4d3945f61b

Sync with 2.17.2

* maint-2.17:
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
---

44f87dac99574a8073ffb1ba8b10bd4d3945f61b
diff --cc submodule-config.c
index 388ef1f892,3c40f1f1c5..6b212bae31
--- a/submodule-config.c
+++ b/submodule-config.c
@@@ -383,10 -383,16 +383,16 @@@ static void warn_multiple_config(const 
  			commit_string, name, option);
  }
  
+ static void warn_command_line_option(const char *var, const char *value)
+ {
+ 	warning(_("ignoring '%s' which may be interpreted as"
+ 		  " a command-line option: %s"), var, value);
+ }
+ 
  struct parse_config_parameter {
  	struct submodule_cache *cache;
 -	const unsigned char *treeish_name;
 -	const unsigned char *gitmodules_sha1;
 +	const struct object_id *treeish_name;
 +	const struct object_id *gitmodules_oid;
  	int overwrite;
  };