Changes: 1. Readded the comment so the patch now shows no added lines at the comments it's just the previous one (As clean as I could do it). /* * If the submodule being added isn't already covered by the * current configured pathspec, set the submodule's active flag */ 2. Instead of ! git config I now use test_must_fail 3. For --force used the same logic the incremental logic. 4. I also updated the docs for --force. 5. Removed the white spaces from the lines. K Jayatheerth (2): submodule: prevent overwriting .gitmodules on path reuse submodule: skip redundant active entries when pattern covers path Documentation/git-submodule.adoc | 7 +++++ builtin/submodule--helper.c | 52 ++++++++++++++++++++++++++++---- t/t7400-submodule-basic.sh | 22 ++++++++++++++ t/t7413-submodule-is-active.sh | 15 +++++++++ 4 files changed, 90 insertions(+), 6 deletions(-) -- 2.50.GIT
