Following commit e5a439dc71 (rm: changes in the '.gitmodules' are staged after using '--cached', 2021-02-18), amend test 46 of the script to ensure that the test also checks for '.gitmodules' modification after a 'git rm --cached <submodule>' i.e., the entry of the submodule in question is removed from the file. Signed-off-by: Shourya Shukla <periperidip@xxxxxxxxx> --- t/t3600-rm.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index 7547f11a5c..45aff97b90 100755 --- a/t/t3600-rm.sh +++ b/t/t3600-rm.sh @@ -309,6 +309,7 @@ cat >expect.modified_untracked <<EOF EOF cat >expect.cached <<EOF +M .gitmodules D submod EOF @@ -390,16 +391,14 @@ test_expect_success 'rm of a populated submodule with different HEAD fails unles test_must_fail git config -f .gitmodules submodule.sub.path ' -test_expect_success 'rm --cached leaves work tree of populated submodules and .gitmodules alone' ' +test_expect_success 'rm --cached leaves work tree of populated submodules alone' ' git reset --hard && git submodule update && git rm --cached submod && test_path_is_dir submod && test_path_is_file submod/.git && git status -s -uno >actual && - test_cmp expect.cached actual && - git config -f .gitmodules submodule.sub.url && - git config -f .gitmodules submodule.sub.path + test_cmp expect.cached actual ' test_expect_success 'rm --dry-run does not touch the submodule or .gitmodules' ' -- 2.25.1
