Re: [PATCH 2/2] t3600: amend test 46 to check for '.gitmodules' modification

From: Philippe Blain <levraiphilippeblain@gmail.com>
Date: Feb 18, 2021, 20:21 UTC
Message-ID: <288ab1ad-d5e8-ab30-e0c2-a3e5f21d05a6@gmail.com>
In-Reply-To: <20210218184931.83613-3-periperidip@gmail.com>

Le 2021-02-18 à 13:49, Shourya Shukla a écrit :

Show 6 quoted lines

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