diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2007-06-11 21:12:21 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-12 01:06:21 -0700 |
| commit | b10ee7606e14265c6116639aafccb863b77043f5 (patch) | |
| tree | 5a22e1e95a0cec76397065272d01bb4cd9d65fe9 /t/t7400-submodule-basic.sh | |
| parent | Teach diff to imply --find-copies-harder upon -C -C (diff) | |
| download | git-b10ee7606e14265c6116639aafccb863b77043f5.tar.gz git-b10ee7606e14265c6116639aafccb863b77043f5.zip | |
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 <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7400-submodule-basic.sh')
| -rwxr-xr-x | t/t7400-submodule-basic.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 3940433b8f..74fafceb71 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 |