git/git-submodule.sh, branch v2.6.2

Sync with 2.4.10

2015-09-28T22:33:56Z

submodule: allow only certain protocols for submodule fetches

2015-09-23T18:35:48Z

Some protocols (like git-remote-ext) can execute arbitrary code found in the URL. The URLs that submodules use may come from arbitrary sources (e.g., .gitmodules files in a remote repository). Let's restrict submodules to fetching from a known-good subset of protocols. Note that we apply this restriction to all submodule commands, whether the URL comes from .gitmodules or not. This is more restrictive than we need to be; for example, in the tests we run: git submodule add ext::... which should be trusted, as the URL comes directly from the command line provided by the user. But doing it this way is simpler, and makes it much less likely that we would miss a case. And since such protocols should be an exception (especially because nobody who clones from them will be able to update the submodules!), it's not likely to inconvenience anyone in practice. Reported-by: Blake Burkhart Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'ah/submodule-typofix-in-error' into maint

2015-09-17T19:11:08Z

Error string fix. * ah/submodule-typofix-in-error: git-submodule: remove extraneous space from error message

git-submodule: remove extraneous space from error message

2015-08-28T18:57:24Z

Signed-off-by: Alex Henrie Acked-by: Chris Packham Signed-off-by: Junio C Hamano

Merge branch 'ps/submodule-sanitize-path-upon-add' into maint

2015-03-05T21:13:10Z

"git submodule add" failed to squash "path/to/././submodule" to "path/to/submodule". * ps/submodule-sanitize-path-upon-add: git-submodule.sh: fix '/././' path normalization

Merge branch 'ps/submodule-sanitize-path-upon-add'

2015-02-22T20:28:26Z

"git submodule add" failed to squash "path/to/././submodule" to "path/to/submodule". * ps/submodule-sanitize-path-upon-add: git-submodule.sh: fix '/././' path normalization

git-submodule.sh: fix '/././' path normalization

2015-02-02T20:35:16Z

When we add a new submodule the path of the submodule is being normalized. We fail to normalize multiple adjacent '/./', though. Thus 'path/to/././submodule' will become 'path/to/./submodule' where it should be 'path/to/submodule' instead. Signed-off-by: Patrick Steinhardt Acked-by: Jens Lehmann Signed-off-by: Junio C Hamano

git-submodule.sh: avoid "echo" path-like values

2014-06-19T20:30:03Z

SysV-derived implementation of "echo" interprets some backslash sequences as special instruction, e.g. "echo 'ab\c'" shows an incomplete line with 'a' and 'b' on it. Avoid using it when showing a path-like values in the script. Signed-off-by: Junio C Hamano

git-submodule.sh: avoid "test -a/-o "

2014-06-19T20:30:03Z

The construct is error-prone; "test" being built-in in most modern shells, the reason to avoid "test && test " spawning one extra process by using a single "test -a " no longer exists. Signed-off-by: Elia Pinto Signed-off-by: Junio C Hamano

Merge branch 'sk/submodules-absolute-path-on-windows'

2014-06-06T18:26:38Z

* sk/submodules-absolute-path-on-windows: Revert "submodules: fix ambiguous absolute paths under Windows"