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

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

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"

Revert "submodules: fix ambiguous absolute paths under Windows"

2014-05-08T20:57:11Z

This reverts commit 4dce7d9b408b2935b85721b54a2010eda7ec1be9, which was originally done to help Windows but was almost immediately reverted in msysGit, and the codebase kept this unnecessary divergence for almost two years. Signed-off-by: Stepan Kasal Signed-off-by: Junio C Hamano

Revert "submodule: explicit local branch creation in module_clone"

2014-04-02T21:15:36Z

This reverts commit 23d25e48f5ead73c9ce233986f90791abec9f1e8, as it is broken for users who haven't opted into the new feature of checking out submodule.*.branch with update mode set to checkout.

Merge branch 'jl/doc-submodule-update-checkout'

2014-03-14T21:26:58Z

Add missing documentation for "submodule update --checkout". * jl/doc-submodule-update-checkout: submodule update: consistently document the '--checkout' option

submodule update: consistently document the '--checkout' option

2014-02-28T23:34:36Z

Commit 322bb6e12f (add update 'none' flag to disable update of submodule by default) added the '--checkout' option to "git submodule update" but forgot to explicitly document it in synopsis, usage string and man page (It is only mentioned implicitly in the man page). In 23d25e48 (submodule: explicit local branch creation in module_clone) the synopsis of the man page was updated, but the "OPTIONS" section of the man page and the usage string of the git-submodule script still do not mention the '--checkout' option. Fix that by documenting this option in usage string and the "OPTIONS" section of man page too. While at it group the update-mode options into a single set in the usage string. Reported-by: Matthijs Kooijman Signed-off-by: Jens Lehmann Signed-off-by: Junio C Hamano