From: Eric Sunshine Date: Mon, 2 Jul 2018 00:23:45 +0000 (-0400) Subject: t/lib-submodule-update: fix "absorbing" test X-Git-Tag: v2.19.0-rc0~109^2~21 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e5d7e9f5164e90386622a80a9dfc4b1675bcc92b?ds=inline;hp=e5d7e9f5164e90386622a80a9dfc4b1675bcc92b t/lib-submodule-update: fix "absorbing" test This test has been dysfunctional since it was added by 259f3ee296 (lib-submodule-update.sh: define tests for recursing into submodules, 2017-03-14), however, the problem went unnoticed due to a broken &&-chain. The test wants to verify that replacing a submodule containing a .git directory will absorb the .git directory into the .git/modules/ of the superproject, and then replace the working tree content appropriate to the superproject. It is, therefore, incorrect to check if the submodule content still exists since the submodule will have been replaced by the content of the superproject. Fix this by removing the submodule content check, which also happens to be the line that broke the &&-chain. While at it, fix broken &&-chains in a couple neighboring tests. Helped-by: Stefan Beller Signed-off-by: Eric Sunshine Signed-off-by: Stefan Beller Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano ---