| Message ID | 20210218184931.83613-3-periperidip@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | rm: changes in the '.gitmodules' are staged after using '--cached' | expand |
Le 2021-02-18 à 13:49, Shourya Shukla a écrit : > 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. > You can't reference your previous commit by hash, since it has not yet made its way to Git's master branch. Usually what is done in that case is writing "In the previous commit, we fixed *** so that *** now does ***. Change *** accordingly" or something like this. However, in the present case the changes to the test should be squashed into the changes to the code, if not the tests are broken when they are run on patch 1/2. In this project *all* commits of a topic branch should pass the test suite before the topic is merged, not just the tip commit. Regarding the changes themselves, they should be tweaked along with patch 1/2 to test the correct behaviour (not modifying the working tree copy of '.gitmodules'.
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' '
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@gmail.com> --- t/t3600-rm.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)