[RFC PATCH 08/10] t7506: cleanup .gitmodules properly before setting up new scenario
- From
Antonio Ospite <ao2@ao2.it>
- Date
- May 14, 2018, 10:58 UTC
- Message-ID
- <20180514105823.8378-9-ao2@ao2.it>
- In-Reply-To
- <20180514105823.8378-1-ao2@ao2.it>
In t/t7506-status-submodule.sh at some point a new scenario is set up to test different things, in particular new submodules are added which are meant to completely replace the previous ones.
However the code just removes .gitmodules from the work tree, still leaving it in the index.
This will break when "submodule--helper config" learns to handle .gitmodules from the index and performs some check when doing that.
Since the test means to get rid of .gitmodules anyways, let's completely remove it from the index, to actually start afresh in the new scenario.
This is more future-proof without breaking current tests.
Signed-off-by: Antonio Ospite <ao2@ao2.it> --- t/t7506-status-submodule.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/t/t7506-status-submodule.sh b/t/t7506-status-submodule.sh index 9edf6572e..389173294 100755 --- a/t/t7506-status-submodule.sh +++ b/t/t7506-status-submodule.sh @@ -325,7 +325,8 @@ test_expect_success 'setup superproject with untracked file in nested submodule' ( cd super && git clean -dfx && - rm .gitmodules && + git rm .gitmodules && + git commit -m "remove .gitmodules" && git submodule add -f ./sub1 && git submodule add -f ./sub2 && git submodule add -f ./sub1 sub3 &&
-- 2.17.0