From: Lars Hjemli Date: Mon, 11 Jun 2007 19:12:21 +0000 (+0200) Subject: t7400: barf if git-submodule removes or replaces a file X-Git-Tag: v1.5.3-rc0~91^2~5 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b10ee7606e14265c6116639aafccb863b77043f5;p=git.git t7400: barf if git-submodule removes or replaces a file The test for an unmolested file wouldn't fail properly if the file had been removed or replaced by something other than a regular file. This fixes it. Signed-off-by: Lars Hjemli Signed-off-by: Junio C Hamano --- diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 3940433b8..74fafceb7 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -72,7 +72,7 @@ test_expect_success 'update should fail when path is used by a file' ' then echo "[OOPS] update should have failed" false - elif test -f lib && test "$(cat lib)" != "hello" + elif test "$(cat lib)" != "hello" then echo "[OOPS] update failed but lib file was molested" false