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

submodule: prevent backslash expantion in submodule names

2017-04-17T03:09:36Z

When attempting to add a submodule with backslashes in its name 'git submodule' fails in a funny way. We can see that some of the backslashes are expanded resulting in a bogus path: git -C main submodule add ../sub\\with\\backslash fatal: repository '/tmp/test/sub\witackslash' does not exist fatal: clone of '/tmp/test/sub\witackslash' into submodule path To solve this, convert calls to 'read' to 'read -r' in git-submodule.sh in order to prevent backslash expantion in submodule names. Reported-by: Joachim Durchholz Signed-off-by: Brandon Williams Reviewed-by: Jeff King Signed-off-by: Junio C Hamano

submodule add: respect submodule.active and submodule..active

2017-03-18T16:51:23Z

In addition to adding submodule..url to the config, set submodule..active to true unless submodule.active is configured and the submodule's path matches the configured pathspec. Signed-off-by: Brandon Williams Signed-off-by: Junio C Hamano

submodule sync: use submodule--helper is-active

2017-03-17T18:06:09Z

Signed-off-by: Brandon Williams Signed-off-by: Junio C Hamano

submodule sync: skip work for inactive submodules

2017-03-17T18:06:09Z

Sync does some work determining what URLs should be used for a submodule but then throws this work away if the submodule isn't active. Instead perform the activity check earlier and skip inactive submodule in order to avoid doing unnecessary work. Signed-off-by: Brandon Williams Signed-off-by: Junio C Hamano

submodule status: use submodule--helper is-active

2017-03-17T18:06:09Z

Signed-off-by: Brandon Williams Signed-off-by: Junio C Hamano

Merge branch 'sb/submodule-update-initial-runs-custom-script'

2017-02-03T19:25:19Z

The user can specify a custom update method that is run when "submodule update" updates an already checked out submodule. This was ignored when checking the submodule out for the first time and we instead always just checked out the commit that is bound to the path in the superproject's index. * sb/submodule-update-initial-runs-custom-script: submodule update: run custom update script for initial populating as well

Merge branch 'sb/submodule-add-force'

2017-02-02T21:36:54Z

"git submodule add" used to be confused and refused to add a locally created repository; users can now use "--force" option to add them. * sb/submodule-add-force: submodule add: extend force flag to add existing repos

submodule update: run custom update script for initial populating as well

2017-01-26T19:06:07Z

In 1b4735d9f3 (submodule: no [--merge|--rebase] when newly cloned, 2011-02-17), all actions were defaulted to checkout for populating a submodule initially, because merging or rebasing makes no sense in that situation. Other commands however do make sense, such as the custom command that was added later (6cb5728c43, submodule update: allow custom command to update submodule working tree, 2013-07-03). I am unsure about the "none" command, as I can see an initial checkout there as a useful thing. On the other hand going strictly by our own documentation, we should do nothing in case of "none" as well, because the user asked for it. Reported-by: Han-Wen Nienhuys Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

Merge branch 'sb/submodule-init'

2017-01-23T23:59:21Z

Error message fix. * sb/submodule-init: submodule update --init: display correct path from submodule

Merge branch 'sb/submodule-embed-gitdir'

2017-01-23T23:59:20Z

Help-text fix. * sb/submodule-embed-gitdir: submodule absorbgitdirs: mention in docstring help